diff --git a/.gitignore b/.gitignore
index d623266a6..27c69dde3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,7 +116,8 @@ src/mesh/TODO
 *.test
 coverage.html
 
-src/gui/integration/wallets/
+src/api/integration/wallets/
+src/api/integration/wallets/
 
 skycoin-cli
 
diff --git a/Makefile b/Makefile
index ea6aa326e..c0fb74739 100644
--- a/Makefile
+++ b/Makefile
@@ -11,22 +11,6 @@ GUI_STATIC_DIR = src/gui/static
 # Electron files directory
 ELECTRON_DIR = electron
 
-# ./src folder does not have code
-# ./src/api folder does not have code
-# ./src/util folder does not have code
-# ./src/ciper/* are libraries manually vendored by cipher that do not need coverage
-# ./src/gui/static* are static assets
-# */testdata* folders do not have code
-# ./src/consensus/example has no buildable code
-PACKAGES = $(shell find ./src -type d -not -path '\./src' \
-    							      -not -path '\./src/api' \
-    							      -not -path '\./src/util' \
-    							      -not -path '\./src/consensus/example' \
-    							      -not -path '\./src/gui/static*' \
-    							      -not -path '\./src/cipher/*' \
-    							      -not -path '*/testdata*' \
-    							      -not -path '*/test-fixtures*')
-
 # Compilation output
 BUILD_DIR = build
 BUILDLIB_DIR = $(BUILD_DIR)/libskycoin
diff --git a/ci-scripts/integration-test-disable-seed-api.sh b/ci-scripts/integration-test-disable-seed-api.sh
index 3e38387b3..4cf2fb8a0 100755
--- a/ci-scripts/integration-test-disable-seed-api.sh
+++ b/ci-scripts/integration-test-disable-seed-api.sh
@@ -55,7 +55,7 @@ echo "starting skycoin node in background with http listener on $HOST"
 ./skycoin-integration -disable-networking=true \
                       -web-interface-port=$PORT \
                       -download-peerlist=false \
-                      -db-path=./src/gui/integration/testdata/blockchain-180.db \
+                      -db-path=./src/api/integration/testdata/blockchain-180.db \
                       -db-read-only=true \
                       -rpc-interface=true \
                       -launch-browser=false \
@@ -76,7 +76,7 @@ set +e
 if [[ -z $TEST || $TEST = "gui" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE SKYCOIN_NODE_HOST=$HOST WALLET_DIR=$WALLET_DIR \
-    go test ./src/gui/integration/... -timeout=30s $VERBOSE $RUN_TESTS
+    go test ./src/api/integration/... -timeout=30s $VERBOSE $RUN_TESTS
 
 GUI_FAIL=$?
 
@@ -85,7 +85,7 @@ fi
 if [[ -z $TEST  || $TEST = "cli" ]]; then
 
 # SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE RPC_ADDR=$RPC_ADDR \
-#     go test ./src/api/cli/integration/... -timeout=30s $VERBOSE $RUN_TESTS
+#     go test ./src/cli/integration/... -timeout=30s $VERBOSE $RUN_TESTS
 
 CLI_FAIL=$?
 
diff --git a/ci-scripts/integration-test-disable-wallet-api.sh b/ci-scripts/integration-test-disable-wallet-api.sh
index a09514a4a..6e12b7205 100755
--- a/ci-scripts/integration-test-disable-wallet-api.sh
+++ b/ci-scripts/integration-test-disable-wallet-api.sh
@@ -68,7 +68,7 @@ echo "starting skycoin node in background with http listener on $HOST"
 ./skycoin-integration -disable-networking=true \
                       -web-interface-port=$PORT \
                       -download-peerlist=false \
-                      -db-path=./src/gui/integration/testdata/blockchain-180.db \
+                      -db-path=./src/api/integration/testdata/blockchain-180.db \
                       -db-read-only=true \
                       -rpc-interface=true \
                       -launch-browser=false \
@@ -88,7 +88,7 @@ set +e
 if [[ -z $TEST || $TEST = "gui" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE SKYCOIN_NODE_HOST=$HOST WALLET_DIR=$WALLET_DIR \
-    go test ./src/gui/integration/... $FAILFAST $UPDATE -timeout=30s $VERBOSE $RUN_TESTS
+    go test ./src/api/integration/... $FAILFAST $UPDATE -timeout=30s $VERBOSE $RUN_TESTS
 
 GUI_FAIL=$?
 
@@ -97,7 +97,7 @@ fi
 if [[ -z $TEST  || $TEST = "cli" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE RPC_ADDR=$RPC_ADDR \
-    go test ./src/api/cli/integration/... $FAILFAST $UPDATE -timeout=30s $VERBOSE $RUN_TESTS
+    go test ./src/cli/integration/... $FAILFAST $UPDATE -timeout=30s $VERBOSE $RUN_TESTS
 
 CLI_FAIL=$?
 
diff --git a/ci-scripts/integration-test-live.sh b/ci-scripts/integration-test-live.sh
index 7faba0289..a39c75473 100755
--- a/ci-scripts/integration-test-live.sh
+++ b/ci-scripts/integration-test-live.sh
@@ -69,13 +69,13 @@ fi
 if [[ -z $TEST || $TEST = "gui" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE SKYCOIN_NODE_HOST=$HOST \
-    go test ./src/gui/integration/... $FAILFAST $UPDATE -timeout=$TIMEOUT $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
+    go test ./src/api/integration/... $FAILFAST $UPDATE -timeout=$TIMEOUT $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
 
 fi
 
 if [[ -z $TEST || $TEST = "cli" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE RPC_ADDR=$RPC_ADDR SKYCOIN_NODE_HOST=$HOST USE_CSRF=$USE_CSRF \
-    go test ./src/api/cli/integration/... $FAILFAST $UPDATE -timeout=$TIMEOUT $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
+    go test ./src/cli/integration/... $FAILFAST $UPDATE -timeout=$TIMEOUT $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
 
 fi
diff --git a/ci-scripts/integration-test-stable.sh b/ci-scripts/integration-test-stable.sh
index 60d61d0b8..51896ff99 100755
--- a/ci-scripts/integration-test-stable.sh
+++ b/ci-scripts/integration-test-stable.sh
@@ -70,7 +70,7 @@ echo "starting skycoin node in background with http listener on $HOST"
 ./skycoin-integration -disable-networking=true \
                       -web-interface-port=$PORT \
                       -download-peerlist=false \
-                      -db-path=./src/gui/integration/testdata/blockchain-180.db \
+                      -db-path=./src/api/integration/testdata/blockchain-180.db \
                       -db-read-only=true \
                       -rpc-interface=true \
                       -launch-browser=false \
@@ -92,7 +92,7 @@ set +e
 if [[ -z $TEST || $TEST = "gui" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE SKYCOIN_NODE_HOST=$HOST \
-    go test ./src/gui/integration/... $UPDATE -timeout=3m $VERBOSE $RUN_TESTS
+    go test ./src/api/integration/... $UPDATE -timeout=3m $VERBOSE $RUN_TESTS
 
 GUI_FAIL=$?
 
@@ -101,7 +101,7 @@ fi
 if [[ -z $TEST  || $TEST = "cli" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE RPC_ADDR=$RPC_ADDR USE_CSRF=$USE_CSRF \
-    go test ./src/api/cli/integration/... $UPDATE -timeout=3m $VERBOSE $RUN_TESTS
+    go test ./src/cli/integration/... $UPDATE -timeout=3m $VERBOSE $RUN_TESTS
 
 CLI_FAIL=$?