Emulate teller-network, coverage still failing

contracts/DAppStore.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.2;
 
-import "./utils/MiniMeTokenInterface.sol";
-import "./utils/ApproveAndCallFallBack.sol";
+import "./token/MiniMeTokenInterface.sol";
+import "./token/ApproveAndCallFallBack.sol";
 import "./utils/SafeMath.sol";
 import "./utils/BancorFormula.sol";
 

contracts/token/MiniMeToken.sol

@@ -23,10 +23,10 @@ pragma solidity ^0.5.2;
  * @dev It is ERC20 compliant, but still needs to under go further testing.
  */
 
-import "./Controlled.sol";
+import "../common/Controlled.sol";
 import "./TokenController.sol";
-import "../utils/ApproveAndCallFallBack.sol";
-import "../utils/MiniMeTokenInterface.sol";
+import "./ApproveAndCallFallBack.sol";
+import "./MiniMeTokenInterface.sol";
 import "./TokenFactory.sol";
 
 /**

test/dappstore_spec.js

@@ -32,8 +32,7 @@ config({
     "DAppStore": {
       args: [ "$SNT" ]
     },
-    "TestBancorFormula": { },
-    "Controlled": { }
+    "TestBancorFormula": { }
   }
 }, (_err, web3_accounts) => {
   accounts = web3_accounts