diff --git a/app/config.go b/app/common/config.go
similarity index 99%
rename from app/config.go
rename to app/common/config.go
index d62ac2b..1abea8e 100644
--- a/app/config.go
+++ b/app/common/config.go
@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"fmt"
diff --git a/app/db.go b/app/common/db.go
similarity index 98%
rename from app/db.go
rename to app/common/db.go
index 44116ca..6a4c477 100644
--- a/app/db.go
+++ b/app/common/db.go
@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"fmt"
diff --git a/app/logging.go b/app/common/logging.go
similarity index 98%
rename from app/logging.go
rename to app/common/logging.go
index a7eb76f..f381ae3 100644
--- a/app/logging.go
+++ b/app/common/logging.go
@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"encoding/json"
diff --git a/app/main.go b/app/main.go
index 2d10e24..0a695da 100644
--- a/app/main.go
+++ b/app/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"iris-test/app/common"
 	"iris-test/app/views"
 	"os"
 	"time"
@@ -15,32 +16,32 @@ import (
 var redisDB *redis.Database
 
 func createSessionEngine() *sessions.Sessions {
-	redisAddr := fmt.Sprintf("%s:%d", Config.Redis.Host, Config.Redis.Port)
+	redisAddr := fmt.Sprintf("%s:%d", common.Config.Redis.Host, common.Config.Redis.Port)
 
 	redisDB = redis.New(redis.Config{
 		Network:   "tcp",
 		Addr:      redisAddr,
 		Timeout:   time.Duration(30) * time.Second,
 		MaxActive: 10,
-		Username:  Config.Redis.Username,
-		Password:  Config.Redis.Password,
-		Database:  Config.Redis.Database,
-		Prefix:    Config.Redis.Prefix,
+		Username:  common.Config.Redis.Username,
+		Password:  common.Config.Redis.Password,
+		Database:  common.Config.Redis.Database,
+		Prefix:    common.Config.Redis.Prefix,
 		Driver:    redis.GoRedis(), // defaults to this driver.
 		// To set a custom, existing go-redis client, use the "SetClient" method:
 		// Driver: redis.GoRedis().SetClient(customGoRedisClient)
 	})
 
-	sessions_engine := sessions.New(sessions.Config{
+	sessionsEngine := sessions.New(sessions.Config{
 		Cookie:          "_session_id",
 		Expires:         0, // defaults to 0: unlimited life. Another good value is: 45 * time.Minute,
 		AllowReclaim:    true,
 		CookieSecureTLS: true,
 	})
 
-	sessions_engine.UseDatabase(redisDB)
+	sessionsEngine.UseDatabase(redisDB)
 
-	return sessions_engine
+	return sessionsEngine
 }
 
 func createAccessLog() *accesslog.AccessLog {
@@ -83,7 +84,7 @@ func createApp() *iris.Application {
 	accessLog := createAccessLog()
 
 	app := iris.New()
-	app.Logger().SetLevel(Config.Application.LogLevel)
+	app.Logger().SetLevel(common.Config.Application.LogLevel)
 	app.Use(sessionsEngine.Handler())
 	app.UseRouter(accessLog.Handler)
 	app.RegisterView(iris.Jet("./app/templates", ".jet").Reload(true))
@@ -92,9 +93,9 @@ func createApp() *iris.Application {
 }
 
 func main() {
-	InitCfg()
-	InitLogging()
-	InitDB()
+	common.InitCfg()
+	common.InitLogging()
+	common.InitDB()
 
 	app := createApp()
 	defer redisDB.Close()