diff --git a/cmd/webapp/adapter/router.go b/adapter/router.go
similarity index 100%
rename from cmd/webapp/adapter/router.go
rename to adapter/router.go
diff --git a/cmd/webapp/adapter/view.go b/adapter/view.go
similarity index 100%
rename from cmd/webapp/adapter/view.go
rename to adapter/view.go
diff --git a/cmd/webapp/handler/login.go b/cmd/webapp/handler/login.go
index be505e4..509eacd 100644
--- a/cmd/webapp/handler/login.go
+++ b/cmd/webapp/handler/login.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/josephspurrier/gocleanarchitecture/cmd/webapp/adapter"
+	"github.com/josephspurrier/gocleanarchitecture/adapter"
 	"github.com/josephspurrier/gocleanarchitecture/domain"
 )
 
diff --git a/cmd/webapp/handler/register.go b/cmd/webapp/handler/register.go
index a3a3425..6ef1ecb 100644
--- a/cmd/webapp/handler/register.go
+++ b/cmd/webapp/handler/register.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/josephspurrier/gocleanarchitecture/cmd/webapp/adapter"
+	"github.com/josephspurrier/gocleanarchitecture/adapter"
 	"github.com/josephspurrier/gocleanarchitecture/domain"
 )
 
diff --git a/cmd/webapp/route.go b/cmd/webapp/route.go
index c33b5e9..d93ff41 100644
--- a/cmd/webapp/route.go
+++ b/cmd/webapp/route.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/josephspurrier/gocleanarchitecture/cmd/webapp/adapter"
+	"github.com/josephspurrier/gocleanarchitecture/adapter"
 	"github.com/josephspurrier/gocleanarchitecture/cmd/webapp/handler"
 	"github.com/josephspurrier/gocleanarchitecture/lib/router"
 )
diff --git a/cmd/webapp/service.go b/cmd/webapp/service.go
index b5c9186..b1c123c 100644
--- a/cmd/webapp/service.go
+++ b/cmd/webapp/service.go
@@ -3,7 +3,6 @@ package main
 import (
 	"github.com/josephspurrier/gocleanarchitecture/adapter"
 	"github.com/josephspurrier/gocleanarchitecture/adapter/jsonrepo"
-	appadapter "github.com/josephspurrier/gocleanarchitecture/cmd/webapp/adapter"
 	"github.com/josephspurrier/gocleanarchitecture/domain"
 	"github.com/josephspurrier/gocleanarchitecture/lib/jsondb"
 	"github.com/josephspurrier/gocleanarchitecture/lib/view"
@@ -12,7 +11,7 @@ import (
 // Service represents all the services that the application uses.
 type Service struct {
 	User domain.IUserService
-	View appadapter.IViewService
+	View adapter.IViewService
 }
 
 // RegisterServices sets up each service and returns the container for all