diff --git a/exe/DevelMain.hs b/app/DevelMain.hs
similarity index 100%
rename from exe/DevelMain.hs
rename to app/DevelMain.hs
diff --git a/exe/devel.hs b/app/devel.hs
similarity index 100%
rename from exe/devel.hs
rename to app/devel.hs
diff --git a/exe/main.hs b/app/main.hs
similarity index 100%
rename from exe/main.hs
rename to app/main.hs
diff --git a/app/models b/models
similarity index 100%
rename from app/models
rename to models
diff --git a/package.yaml b/package.yaml
index d9a41d8e0..3830186c9 100644
--- a/package.yaml
+++ b/package.yaml
@@ -68,7 +68,7 @@ library:
 executables:
   uniworx:
     main: main.hs
-    source-dirs: exe
+    source-dirs: app
     ghc-options:
     - -threaded
     - -rtsopts
diff --git a/app/routes b/routes
similarity index 100%
rename from app/routes
rename to routes
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 7f1329238..8ae8a28c7 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -56,7 +56,7 @@ data MenuTypes
 -- This function also generates the following type synonyms:
 -- type Handler = HandlerT App IO
 -- type Widget = WidgetT App IO ()
-mkYesodData "App" $(parseRoutesFile "app/routes")
+mkYesodData "App" $(parseRoutesFile "routes")
 
 -- | A convenient synonym for creating forms.
 type Form x = Html -> MForm (HandlerT App IO) (FormResult x, Widget)
diff --git a/src/Model.hs b/src/Model.hs
index b3cd1712b..dedba802f 100644
--- a/src/Model.hs
+++ b/src/Model.hs
@@ -23,7 +23,7 @@ import Model.Types
 -- at:
 -- http://www.yesodweb.com/book/persistent/
 share [mkPersist sqlSettings, mkMigrate "migrateAll"]
-    $(persistFileWith lowerCaseSettings "app/models")
+    $(persistFileWith lowerCaseSettings "models")
 
 instance Show Term where
   show = ClassyPrelude.Yesod.unpack . termName