diff --git a/contracts/ExpenseBase.sol b/contracts/bases/ExpenseBase.sol
similarity index 94%
rename from contracts/ExpenseBase.sol
rename to contracts/bases/ExpenseBase.sol
index a501979..cdb8e41 100644
--- a/contracts/ExpenseBase.sol
+++ b/contracts/bases/ExpenseBase.sol
@@ -1,9 +1,9 @@
 pragma solidity ^0.4.24;
 
-import "./ExpenseLib.sol";
+import "../libs/ExpenseLib.sol";
 
-import "./interfaces/IDestination.sol";
-import "./interfaces/IReceiver.sol";
+import "../interfaces/IDestination.sol";
+import "../interfaces/IReceiver.sol";
 
 import "zeppelin-solidity/contracts/math/SafeMath.sol";
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";
diff --git a/contracts/SplitterBase.sol b/contracts/bases/SplitterBase.sol
similarity index 93%
rename from contracts/SplitterBase.sol
rename to contracts/bases/SplitterBase.sol
index 62fadf5..9fdbed0 100644
--- a/contracts/SplitterBase.sol
+++ b/contracts/bases/SplitterBase.sol
@@ -1,11 +1,11 @@
 pragma solidity ^0.4.24;
 
-import "./SplitterLib.sol";
+import "../libs/SplitterLib.sol";
 
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";
 
-import "./interfaces/ISplitter.sol";
-import "./interfaces/IReceiver.sol";
+import "../interfaces/ISplitter.sol";
+import "../interfaces/IReceiver.sol";
 
 
 /**
diff --git a/contracts/TableBase.sol b/contracts/bases/TableBase.sol
similarity index 97%
rename from contracts/TableBase.sol
rename to contracts/bases/TableBase.sol
index 67f7b18..8193707 100644
--- a/contracts/TableBase.sol
+++ b/contracts/bases/TableBase.sol
@@ -1,11 +1,11 @@
 pragma solidity ^0.4.23;
 
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";
-import "./interfaces/IReceiver.sol";
-import "./interfaces/ITable.sol";
+import "../interfaces/IReceiver.sol";
+import "../interfaces/ITable.sol";
 
-import "./ExpenseLib.sol";
-import "./SplitterLib.sol";
+import "../libs/ExpenseLib.sol";
+import "../libs/SplitterLib.sol";
 
 
 /**
diff --git a/contracts/ether/WeiExpense.sol b/contracts/ether/WeiExpense.sol
index 24a4d03..576e677 100644
--- a/contracts/ether/WeiExpense.sol
+++ b/contracts/ether/WeiExpense.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.24;
 
-import "../ExpenseBase.sol";
+import "../bases/ExpenseBase.sol";
 
 import "../interfaces/IDestination.sol";
 import "../interfaces/IReceiver.sol";
diff --git a/contracts/ether/WeiSplitter.sol b/contracts/ether/WeiSplitter.sol
index dec8e3b..90ede73 100644
--- a/contracts/ether/WeiSplitter.sol
+++ b/contracts/ether/WeiSplitter.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.24;
 
-import "../SplitterBase.sol";
+import "../bases/SplitterBase.sol";
 
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";
 
diff --git a/contracts/ether/WeiTable.sol b/contracts/ether/WeiTable.sol
index 53a40e2..235fb01 100644
--- a/contracts/ether/WeiTable.sol
+++ b/contracts/ether/WeiTable.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.24;
 
-import "../TableBase.sol";
-import "../ExpenseBase.sol";
-import "../SplitterBase.sol";
+import "../bases/TableBase.sol";
+import "../bases/ExpenseBase.sol";
+import "../bases/SplitterBase.sol";
 
 import "../interfaces/IReceiver.sol";
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";
diff --git a/contracts/ExpenseLib.sol b/contracts/libs/ExpenseLib.sol
similarity index 100%
rename from contracts/ExpenseLib.sol
rename to contracts/libs/ExpenseLib.sol
diff --git a/contracts/SplitterLib.sol b/contracts/libs/SplitterLib.sol
similarity index 98%
rename from contracts/SplitterLib.sol
rename to contracts/libs/SplitterLib.sol
index 0eb35e4..f23d1e7 100644
--- a/contracts/SplitterLib.sol
+++ b/contracts/libs/SplitterLib.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.23;
 
 import "zeppelin-solidity/contracts/ownership/Ownable.sol";
-import "./interfaces/IReceiver.sol";
-import "./interfaces/ITable.sol";
+import "../interfaces/IReceiver.sol";
+import "../interfaces/ITable.sol";
 
 
 /**