diff --git a/blog.cabal b/blog.cabal
index 9fe19e78a92f29d866472cf03b55ff7a0ca190d3..8d1d2740b994ddfa61c32e77e371a781884844db 100644
--- a/blog.cabal
+++ b/blog.cabal
@@ -6,25 +6,25 @@ name:           blog
 version:        0.2.0.0
 synopsis:       Chromabits blog generator and server
 description:    Please see README.md
+category:       Web
 homepage:       https://chromabits.com
+author:         Eduardo Trujillo <ed@chromabits.com>
+copyright:      2015-2017 Eduardo Trujillo
 license:        MIT
 license-file:   LICENSE
 build-type:     Simple
 cabal-version:  >= 1.10
-author:         Eduardo Trujillo <ed@chromabits.com>
-copyright:      2015-2017 Eduardo Trujillo
-category:       Web
 
 executable blog
   main-is: site.hs
   hs-source-dirs:
-      app
+      src
   ghc-options: -threaded
   build-depends:
       base >= 4.9
     , lens
     , text
-    , kawaii
+    , kawaii == 0.0.2.*
     , data-default
     , containers == 0.5.*
     , hakyll == 4.9.*
@@ -42,13 +42,13 @@ executable blog
 executable server
   main-is: server.hs
   hs-source-dirs:
-      app
+      src
   ghc-options: -threaded
   build-depends:
       base >= 4.9
     , lens
     , text
-    , kawaii
+    , kawaii == 0.0.2.*
     , data-default
     , containers == 0.5.*
     , safe == 0.3.*
diff --git a/package.yaml b/package.yaml
index e3f08825d9491f530660e4f47c7ae04322d1068c..b76958805f8287ba6ea0a905f677fab71afc0984 100644
--- a/package.yaml
+++ b/package.yaml
@@ -14,7 +14,7 @@ dependencies:
   - base >= 4.9
   - lens
   - text
-  - kawaii
+  - kawaii == 0.0.2.*
   - data-default
   - containers == 0.5.*
 
@@ -22,7 +22,7 @@ executables:
   blog:
     main: site.hs
     source-dirs:
-      - app
+      - src
     dependencies:
       - hakyll == 4.9.*
       - filepath == 1.4.*
@@ -37,7 +37,7 @@ executables:
   server:
     main: server.hs
     source-dirs:
-      - app
+      - src
     dependencies:
       - safe == 0.3.*
       - bytestring == 0.10.*
diff --git a/app/frontmatter.hs b/src/frontmatter.hs
similarity index 100%
rename from app/frontmatter.hs
rename to src/frontmatter.hs
diff --git a/app/server.hs b/src/server.hs
similarity index 100%
rename from app/server.hs
rename to src/server.hs
diff --git a/app/site.hs b/src/site.hs
similarity index 100%
rename from app/site.hs
rename to src/site.hs
diff --git a/app/tls-server.hs b/src/tls-server.hs
similarity index 100%
rename from app/tls-server.hs
rename to src/tls-server.hs