diff --git a/contracts/Aggregator.go b/contracts/aggregator/Aggregator.go
similarity index 99%
rename from contracts/Aggregator.go
rename to contracts/aggregator/Aggregator.go
index 3c37eb6..6e799d6 100644
--- a/contracts/Aggregator.go
+++ b/contracts/aggregator/Aggregator.go
@@ -1,7 +1,7 @@
 // Code generated - DO NOT EDIT.
 // This file is a generated binding and any manual changes will be lost.
 
-package contracts
+package aggregator
 
 import (
 	"math/big"
diff --git a/contracts/Mediator.go b/contracts/mediator/Mediator.go
similarity index 99%
rename from contracts/Mediator.go
rename to contracts/mediator/Mediator.go
index bc3332c..3c4bf94 100644
--- a/contracts/Mediator.go
+++ b/contracts/mediator/Mediator.go
@@ -1,7 +1,7 @@
 // Code generated - DO NOT EDIT.
 // This file is a generated binding and any manual changes will be lost.
 
-package contracts
+package mediator
 
 import (
 	"math/big"
diff --git a/contracts/OracleEmitter.go b/contracts/oracleemitter/OracleEmitter.go
similarity index 99%
rename from contracts/OracleEmitter.go
rename to contracts/oracleemitter/OracleEmitter.go
index 5af7ac3..0b082fb 100644
--- a/contracts/OracleEmitter.go
+++ b/contracts/oracleemitter/OracleEmitter.go
@@ -1,7 +1,7 @@
 // Code generated - DO NOT EDIT.
 // This file is a generated binding and any manual changes will be lost.
 
-package contracts
+package oracleemitter
 
 import (
 	"math/big"
diff --git a/contracts/Ownable.go b/contracts/ownable/Ownable.go
similarity index 99%
rename from contracts/Ownable.go
rename to contracts/ownable/Ownable.go
index 0872446..58ec402 100644
--- a/contracts/Ownable.go
+++ b/contracts/ownable/Ownable.go
@@ -1,7 +1,7 @@
 // Code generated - DO NOT EDIT.
 // This file is a generated binding and any manual changes will be lost.
 
-package contracts
+package ownable
 
 import (
 	"math/big"
diff --git a/contracts/Whitelist.go b/contracts/whitelist/Whitelist.go
similarity index 99%
rename from contracts/Whitelist.go
rename to contracts/whitelist/Whitelist.go
index afb0aeb..35295e0 100644
--- a/contracts/Whitelist.go
+++ b/contracts/whitelist/Whitelist.go
@@ -1,7 +1,7 @@
 // Code generated - DO NOT EDIT.
 // This file is a generated binding and any manual changes will be lost.
 
-package contracts
+package whitelist
 
 import (
 	"math/big"