diff --git a/cmd/thalos/server.go b/cmd/thalos/server.go
index 412f007..7be4b29 100644
--- a/cmd/thalos/server.go
+++ b/cmd/thalos/server.go
@@ -18,12 +18,12 @@ import (
 	_ "github.com/eosswedenorg/thalos/api/message/json"
 	_ "github.com/eosswedenorg/thalos/api/message/msgpack"
 	api_redis "github.com/eosswedenorg/thalos/api/redis"
-	"github.com/eosswedenorg/thalos/app"
-	"github.com/eosswedenorg/thalos/app/abi"
-	. "github.com/eosswedenorg/thalos/app/cache"
-	"github.com/eosswedenorg/thalos/app/config"
-	driver "github.com/eosswedenorg/thalos/app/driver/redis"
-	. "github.com/eosswedenorg/thalos/app/log"
+	"github.com/eosswedenorg/thalos/internal/abi"
+	. "github.com/eosswedenorg/thalos/internal/cache"
+	"github.com/eosswedenorg/thalos/internal/config"
+	driver "github.com/eosswedenorg/thalos/internal/driver/redis"
+	. "github.com/eosswedenorg/thalos/internal/log"
+	. "github.com/eosswedenorg/thalos/internal/server"
 	redis_cache "github.com/go-redis/cache/v9"
 	"github.com/nikoksr/notify"
 	"github.com/nikoksr/notify/service/telegram"
@@ -46,7 +46,7 @@ var cache *Cache
 
 var cacheStore Store
 
-func readerLoop(processor *app.ShipProcessor) {
+func readerLoop(processor *ShipProcessor) {
 	recon_cnt := 0
 
 	exp := &backoff.ExponentialBackOff{
@@ -128,7 +128,7 @@ func readerLoop(processor *app.ShipProcessor) {
 	}
 }
 
-func run(processor *app.ShipProcessor) {
+func run(processor *ShipProcessor) {
 	// Spawn reader loop in another thread.
 	go readerLoop(processor)
 
@@ -170,8 +170,8 @@ func initAbiManger(api *eos.API, chain_id string) *abi.AbiManager {
 	return abi.NewAbiManager(cache, api)
 }
 
-func stateLoader(chainInfo *eos.InfoResp, current_block_no_cache bool) app.StateLoader {
-	return func(state *app.State) {
+func stateLoader(chainInfo *eos.InfoResp, current_block_no_cache bool) StateLoader {
+	return func(state *State) {
 		var source string
 
 		// Load state from cache.
@@ -207,7 +207,7 @@ func stateLoader(chainInfo *eos.InfoResp, current_block_no_cache bool) app.State
 	}
 }
 
-func stateSaver(state app.State) error {
+func stateSaver(state State) error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*500)
 	defer cancel()
 	return cache.Set(ctx, "state", state, 0)
@@ -337,7 +337,7 @@ func serverCmd(ctx *cli.Context) error {
 
 	chain_id := getChain(chainInfo.ChainID.String())
 
-	processor := app.SpawnProccessor(
+	processor := SpawnProccessor(
 		shClient,
 		stateLoader(chainInfo, skip_currentblock_cache),
 		stateSaver,
diff --git a/cmd/tools/main.go b/cmd/tools/main.go
index 4670591..bf8a396 100644
--- a/cmd/tools/main.go
+++ b/cmd/tools/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	_ "github.com/eosswedenorg/thalos/app/log"
+	_ "github.com/eosswedenorg/thalos/internal/log"
 	log "github.com/sirupsen/logrus"
 )
 
diff --git a/cmd/tools/mock_publisher.go b/cmd/tools/mock_publisher.go
index 7d69e1a..421c6e4 100644
--- a/cmd/tools/mock_publisher.go
+++ b/cmd/tools/mock_publisher.go
@@ -10,7 +10,7 @@ import (
 	"github.com/eosswedenorg/thalos/api/message"
 	_ "github.com/eosswedenorg/thalos/api/message/json"
 	api_redis "github.com/eosswedenorg/thalos/api/redis"
-	redis_driver "github.com/eosswedenorg/thalos/app/driver/redis"
+	redis_driver "github.com/eosswedenorg/thalos/internal/driver/redis"
 
 	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
diff --git a/app/abi/manager.go b/internal/abi/manager.go
similarity index 96%
rename from app/abi/manager.go
rename to internal/abi/manager.go
index 43be262..2441e01 100644
--- a/app/abi/manager.go
+++ b/internal/abi/manager.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	eos "github.com/eoscanada/eos-go"
-	"github.com/eosswedenorg/thalos/app/cache"
+	"github.com/eosswedenorg/thalos/internal/cache"
 )
 
 // AbiManager handles an ABI cache that fetches the ABI from an API on cache miss.
diff --git a/app/abi/manager_test.go b/internal/abi/manager_test.go
similarity index 99%
rename from app/abi/manager_test.go
rename to internal/abi/manager_test.go
index 661c8ec..7ecfc75 100644
--- a/app/abi/manager_test.go
+++ b/internal/abi/manager_test.go
@@ -9,7 +9,7 @@ import (
 
 	eos "github.com/eoscanada/eos-go"
 
-	"github.com/eosswedenorg/thalos/app/cache"
+	"github.com/eosswedenorg/thalos/internal/cache"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/app/cache/cache.go b/internal/cache/cache.go
similarity index 100%
rename from app/cache/cache.go
rename to internal/cache/cache.go
diff --git a/app/cache/memory_store.go b/internal/cache/memory_store.go
similarity index 100%
rename from app/cache/memory_store.go
rename to internal/cache/memory_store.go
diff --git a/app/cache/memory_store_test.go b/internal/cache/memory_store_test.go
similarity index 100%
rename from app/cache/memory_store_test.go
rename to internal/cache/memory_store_test.go
diff --git a/app/cache/redis_store.go b/internal/cache/redis_store.go
similarity index 100%
rename from app/cache/redis_store.go
rename to internal/cache/redis_store.go
diff --git a/app/cache/redis_store_test.go b/internal/cache/redis_store_test.go
similarity index 100%
rename from app/cache/redis_store_test.go
rename to internal/cache/redis_store_test.go
diff --git a/app/cache/store.go b/internal/cache/store.go
similarity index 100%
rename from app/cache/store.go
rename to internal/cache/store.go
diff --git a/app/config/cli.go b/internal/config/cli.go
similarity index 100%
rename from app/config/cli.go
rename to internal/config/cli.go
diff --git a/app/config/config.go b/internal/config/config.go
similarity index 96%
rename from app/config/config.go
rename to internal/config/config.go
index 1e71e33..790d647 100644
--- a/app/config/config.go
+++ b/internal/config/config.go
@@ -3,7 +3,7 @@ package config
 import (
 	"time"
 
-	"github.com/eosswedenorg/thalos/app/log"
+	"github.com/eosswedenorg/thalos/internal/log"
 
 	shipclient "github.com/eosswedenorg-go/antelope-ship-client"
 )
diff --git a/app/config/config_test.go b/internal/config/config_test.go
similarity index 98%
rename from app/config/config_test.go
rename to internal/config/config_test.go
index f3737a7..d798436 100644
--- a/app/config/config_test.go
+++ b/internal/config/config_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/eosswedenorg/thalos/app/log"
+	"github.com/eosswedenorg/thalos/internal/log"
 	"github.com/stretchr/testify/require"
 
 	shipclient "github.com/eosswedenorg-go/antelope-ship-client"
diff --git a/app/config/file.go b/internal/config/file.go
similarity index 100%
rename from app/config/file.go
rename to internal/config/file.go
diff --git a/app/config/yaml.go b/internal/config/yaml.go
similarity index 100%
rename from app/config/yaml.go
rename to internal/config/yaml.go
diff --git a/app/driver/redis/publisher.go b/internal/driver/redis/publisher.go
similarity index 100%
rename from app/driver/redis/publisher.go
rename to internal/driver/redis/publisher.go
diff --git a/app/driver/redis/publisher_test.go b/internal/driver/redis/publisher_test.go
similarity index 100%
rename from app/driver/redis/publisher_test.go
rename to internal/driver/redis/publisher_test.go
diff --git a/app/driver/writer.go b/internal/driver/writer.go
similarity index 100%
rename from app/driver/writer.go
rename to internal/driver/writer.go
diff --git a/app/log/HookWriter.go b/internal/log/HookWriter.go
similarity index 100%
rename from app/log/HookWriter.go
rename to internal/log/HookWriter.go
diff --git a/app/log/RotatingFile.go b/internal/log/RotatingFile.go
similarity index 100%
rename from app/log/RotatingFile.go
rename to internal/log/RotatingFile.go
diff --git a/app/log/config.go b/internal/log/config.go
similarity index 93%
rename from app/log/config.go
rename to internal/log/config.go
index 16498ce..b5114f8 100644
--- a/app/log/config.go
+++ b/internal/log/config.go
@@ -4,7 +4,7 @@ import (
 	"path"
 	"time"
 
-	"github.com/eosswedenorg/thalos/app/types"
+	"github.com/eosswedenorg/thalos/internal/types"
 )
 
 // Config represents configuration parameters for a log.
diff --git a/app/log/config_test.go b/internal/log/config_test.go
similarity index 100%
rename from app/log/config_test.go
rename to internal/log/config_test.go
diff --git a/app/log/init.go b/internal/log/init.go
similarity index 100%
rename from app/log/init.go
rename to internal/log/init.go
diff --git a/app/ship_processor.go b/internal/server/ship_processor.go
similarity index 98%
rename from app/ship_processor.go
rename to internal/server/ship_processor.go
index b750cb5..d510c99 100644
--- a/app/ship_processor.go
+++ b/internal/server/ship_processor.go
@@ -1,4 +1,4 @@
-package app
+package server
 
 import (
 	"encoding/hex"
@@ -6,8 +6,8 @@ import (
 
 	"github.com/eosswedenorg/thalos/api"
 	"github.com/eosswedenorg/thalos/api/message"
-	"github.com/eosswedenorg/thalos/app/abi"
-	"github.com/eosswedenorg/thalos/app/driver"
+	"github.com/eosswedenorg/thalos/internal/abi"
+	"github.com/eosswedenorg/thalos/internal/driver"
 
 	log "github.com/sirupsen/logrus"
 
diff --git a/app/state.go b/internal/server/state.go
similarity index 94%
rename from app/state.go
rename to internal/server/state.go
index 2edb323..d8312ef 100644
--- a/app/state.go
+++ b/internal/server/state.go
@@ -1,4 +1,4 @@
-package app
+package server
 
 // State represents thalos runtime state
 type State struct {
diff --git a/app/types/size.go b/internal/types/size.go
similarity index 100%
rename from app/types/size.go
rename to internal/types/size.go
diff --git a/app/types/size_test.go b/internal/types/size_test.go
similarity index 100%
rename from app/types/size_test.go
rename to internal/types/size_test.go