diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3834292d7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.stack-work/
+stic.cabal
+*~
+/.dir-locals.el
+stack*.yaml.lock
diff --git a/stic/ChangeLog.md b/ChangeLog.md
similarity index 100%
rename from stic/ChangeLog.md
rename to ChangeLog.md
diff --git a/stic/LICENSE b/LICENSE
similarity index 100%
rename from stic/LICENSE
rename to LICENSE
diff --git a/stic/README.md b/README.md
similarity index 100%
rename from stic/README.md
rename to README.md
diff --git a/stic/Setup.hs b/Setup.hs
similarity index 100%
rename from stic/Setup.hs
rename to Setup.hs
diff --git a/stic/app/Main.hs b/app/Main.hs
similarity index 100%
rename from stic/app/Main.hs
rename to app/Main.hs
diff --git a/stic/benchmark/Main.hs b/benchmark/Main.hs
similarity index 100%
rename from stic/benchmark/Main.hs
rename to benchmark/Main.hs
diff --git a/stic/data/Generator/templates/react-app/README.md b/data/Generator/templates/react-app/README.md
similarity index 100%
rename from stic/data/Generator/templates/react-app/README.md
rename to data/Generator/templates/react-app/README.md
diff --git a/stic/data/Generator/templates/react-app/gitignore b/data/Generator/templates/react-app/gitignore
similarity index 100%
rename from stic/data/Generator/templates/react-app/gitignore
rename to data/Generator/templates/react-app/gitignore
diff --git a/stic/data/Generator/templates/react-app/package.json b/data/Generator/templates/react-app/package.json
similarity index 100%
rename from stic/data/Generator/templates/react-app/package.json
rename to data/Generator/templates/react-app/package.json
diff --git a/stic/data/Generator/templates/react-app/public/favicon.ico b/data/Generator/templates/react-app/public/favicon.ico
similarity index 100%
rename from stic/data/Generator/templates/react-app/public/favicon.ico
rename to data/Generator/templates/react-app/public/favicon.ico
diff --git a/stic/data/Generator/templates/react-app/public/index.html b/data/Generator/templates/react-app/public/index.html
similarity index 100%
rename from stic/data/Generator/templates/react-app/public/index.html
rename to data/Generator/templates/react-app/public/index.html
diff --git a/stic/data/Generator/templates/react-app/public/manifest.json b/data/Generator/templates/react-app/public/manifest.json
similarity index 100%
rename from stic/data/Generator/templates/react-app/public/manifest.json
rename to data/Generator/templates/react-app/public/manifest.json
diff --git a/stic/data/Generator/templates/react-app/src/_Page.js b/data/Generator/templates/react-app/src/_Page.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/_Page.js
rename to data/Generator/templates/react-app/src/_Page.js
diff --git a/stic/data/Generator/templates/react-app/src/entities/_entity/_Entity.js b/data/Generator/templates/react-app/src/entities/_entity/_Entity.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/entities/_entity/_Entity.js
rename to data/Generator/templates/react-app/src/entities/_entity/_Entity.js
diff --git a/stic/data/Generator/templates/react-app/src/entities/_entity/actionTypes.js b/data/Generator/templates/react-app/src/entities/_entity/actionTypes.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/entities/_entity/actionTypes.js
rename to data/Generator/templates/react-app/src/entities/_entity/actionTypes.js
diff --git a/stic/data/Generator/templates/react-app/src/entities/_entity/actions.js b/data/Generator/templates/react-app/src/entities/_entity/actions.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/entities/_entity/actions.js
rename to data/Generator/templates/react-app/src/entities/_entity/actions.js
diff --git a/stic/data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js b/data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js
rename to data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js
diff --git a/stic/data/Generator/templates/react-app/src/entities/_entity/components/List.js b/data/Generator/templates/react-app/src/entities/_entity/components/List.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/entities/_entity/components/List.js
rename to data/Generator/templates/react-app/src/entities/_entity/components/List.js
diff --git a/stic/data/Generator/templates/react-app/src/entities/_entity/state.js b/data/Generator/templates/react-app/src/entities/_entity/state.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/entities/_entity/state.js
rename to data/Generator/templates/react-app/src/entities/_entity/state.js
diff --git a/stic/data/Generator/templates/react-app/src/index.css b/data/Generator/templates/react-app/src/index.css
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/index.css
rename to data/Generator/templates/react-app/src/index.css
diff --git a/stic/data/Generator/templates/react-app/src/index.js b/data/Generator/templates/react-app/src/index.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/index.js
rename to data/Generator/templates/react-app/src/index.js
diff --git a/stic/data/Generator/templates/react-app/src/logo.png b/data/Generator/templates/react-app/src/logo.png
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/logo.png
rename to data/Generator/templates/react-app/src/logo.png
diff --git a/stic/data/Generator/templates/react-app/src/reducers.js b/data/Generator/templates/react-app/src/reducers.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/reducers.js
rename to data/Generator/templates/react-app/src/reducers.js
diff --git a/stic/data/Generator/templates/react-app/src/router.js b/data/Generator/templates/react-app/src/router.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/router.js
rename to data/Generator/templates/react-app/src/router.js
diff --git a/stic/data/Generator/templates/react-app/src/serviceWorker.js b/data/Generator/templates/react-app/src/serviceWorker.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/serviceWorker.js
rename to data/Generator/templates/react-app/src/serviceWorker.js
diff --git a/stic/data/Generator/templates/react-app/src/store/index.js b/data/Generator/templates/react-app/src/store/index.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/store/index.js
rename to data/Generator/templates/react-app/src/store/index.js
diff --git a/stic/data/Generator/templates/react-app/src/store/middleware/logger.js b/data/Generator/templates/react-app/src/store/middleware/logger.js
similarity index 100%
rename from stic/data/Generator/templates/react-app/src/store/middleware/logger.js
rename to data/Generator/templates/react-app/src/store/middleware/logger.js
diff --git a/stic/examples/todoMVC.wasp b/examples/todoMVC.wasp
similarity index 100%
rename from stic/examples/todoMVC.wasp
rename to examples/todoMVC.wasp
diff --git a/stic/package.yaml b/package.yaml
similarity index 100%
rename from stic/package.yaml
rename to package.yaml
diff --git a/stic/run b/run
similarity index 100%
rename from stic/run
rename to run
diff --git a/stic/src/Generator.hs b/src/Generator.hs
similarity index 100%
rename from stic/src/Generator.hs
rename to src/Generator.hs
diff --git a/stic/src/Generator/EntityGenerator.hs b/src/Generator/EntityGenerator.hs
similarity index 100%
rename from stic/src/Generator/EntityGenerator.hs
rename to src/Generator/EntityGenerator.hs
diff --git a/stic/src/Generator/FileDraft.hs b/src/Generator/FileDraft.hs
similarity index 100%
rename from stic/src/Generator/FileDraft.hs
rename to src/Generator/FileDraft.hs
diff --git a/stic/src/Generator/FileDraft/CopyFileDraft.hs b/src/Generator/FileDraft/CopyFileDraft.hs
similarity index 100%
rename from stic/src/Generator/FileDraft/CopyFileDraft.hs
rename to src/Generator/FileDraft/CopyFileDraft.hs
diff --git a/stic/src/Generator/FileDraft/FileDraftIO.hs b/src/Generator/FileDraft/FileDraftIO.hs
similarity index 100%
rename from stic/src/Generator/FileDraft/FileDraftIO.hs
rename to src/Generator/FileDraft/FileDraftIO.hs
diff --git a/stic/src/Generator/FileDraft/TemplateFileDraft.hs b/src/Generator/FileDraft/TemplateFileDraft.hs
similarity index 100%
rename from stic/src/Generator/FileDraft/TemplateFileDraft.hs
rename to src/Generator/FileDraft/TemplateFileDraft.hs
diff --git a/stic/src/Generator/FileDraft/TextFileDraft.hs b/src/Generator/FileDraft/TextFileDraft.hs
similarity index 100%
rename from stic/src/Generator/FileDraft/TextFileDraft.hs
rename to src/Generator/FileDraft/TextFileDraft.hs
diff --git a/stic/src/Generator/FileDraft/WriteableToFile.hs b/src/Generator/FileDraft/WriteableToFile.hs
similarity index 100%
rename from stic/src/Generator/FileDraft/WriteableToFile.hs
rename to src/Generator/FileDraft/WriteableToFile.hs
diff --git a/stic/src/Generator/Generators.hs b/src/Generator/Generators.hs
similarity index 100%
rename from stic/src/Generator/Generators.hs
rename to src/Generator/Generators.hs
diff --git a/stic/src/Generator/PageGenerator.hs b/src/Generator/PageGenerator.hs
similarity index 100%
rename from stic/src/Generator/PageGenerator.hs
rename to src/Generator/PageGenerator.hs
diff --git a/stic/src/Generator/Templates.hs b/src/Generator/Templates.hs
similarity index 100%
rename from stic/src/Generator/Templates.hs
rename to src/Generator/Templates.hs
diff --git a/stic/src/Lexer.hs b/src/Lexer.hs
similarity index 100%
rename from stic/src/Lexer.hs
rename to src/Lexer.hs
diff --git a/stic/src/Lib.hs b/src/Lib.hs
similarity index 100%
rename from stic/src/Lib.hs
rename to src/Lib.hs
diff --git a/stic/src/Parser.hs b/src/Parser.hs
similarity index 100%
rename from stic/src/Parser.hs
rename to src/Parser.hs
diff --git a/stic/src/Parser/App.hs b/src/Parser/App.hs
similarity index 100%
rename from stic/src/Parser/App.hs
rename to src/Parser/App.hs
diff --git a/stic/src/Parser/Common.hs b/src/Parser/Common.hs
similarity index 100%
rename from stic/src/Parser/Common.hs
rename to src/Parser/Common.hs
diff --git a/stic/src/Parser/Entity.hs b/src/Parser/Entity.hs
similarity index 100%
rename from stic/src/Parser/Entity.hs
rename to src/Parser/Entity.hs
diff --git a/stic/src/Parser/Page.hs b/src/Parser/Page.hs
similarity index 100%
rename from stic/src/Parser/Page.hs
rename to src/Parser/Page.hs
diff --git a/stic/src/Util.hs b/src/Util.hs
similarity index 100%
rename from stic/src/Util.hs
rename to src/Util.hs
diff --git a/stic/src/Util/Fib.hs b/src/Util/Fib.hs
similarity index 100%
rename from stic/src/Util/Fib.hs
rename to src/Util/Fib.hs
diff --git a/stic/src/Wasp.hs b/src/Wasp.hs
similarity index 100%
rename from stic/src/Wasp.hs
rename to src/Wasp.hs
diff --git a/stic/stack.yaml b/stack.yaml
similarity index 100%
rename from stic/stack.yaml
rename to stack.yaml
diff --git a/stic/.gitignore b/stic/.gitignore
deleted file mode 100644
index 1d0a795cd..000000000
--- a/stic/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.stack-work/
-stic.cabal
-*~
-.dir-locals.el
diff --git a/stic/test/Generator/EntityGeneratorTest.hs b/test/Generator/EntityGeneratorTest.hs
similarity index 100%
rename from stic/test/Generator/EntityGeneratorTest.hs
rename to test/Generator/EntityGeneratorTest.hs
diff --git a/stic/test/Generator/FileDraft/CopyFileDraftTest.hs b/test/Generator/FileDraft/CopyFileDraftTest.hs
similarity index 100%
rename from stic/test/Generator/FileDraft/CopyFileDraftTest.hs
rename to test/Generator/FileDraft/CopyFileDraftTest.hs
diff --git a/stic/test/Generator/FileDraft/TemplateFileDraftTest.hs b/test/Generator/FileDraft/TemplateFileDraftTest.hs
similarity index 100%
rename from stic/test/Generator/FileDraft/TemplateFileDraftTest.hs
rename to test/Generator/FileDraft/TemplateFileDraftTest.hs
diff --git a/stic/test/Generator/GeneratorsTest.hs b/test/Generator/GeneratorsTest.hs
similarity index 100%
rename from stic/test/Generator/GeneratorsTest.hs
rename to test/Generator/GeneratorsTest.hs
diff --git a/stic/test/Generator/MockFileDraftIO.hs b/test/Generator/MockFileDraftIO.hs
similarity index 100%
rename from stic/test/Generator/MockFileDraftIO.hs
rename to test/Generator/MockFileDraftIO.hs
diff --git a/stic/test/Generator/PageGeneratorTest.hs b/test/Generator/PageGeneratorTest.hs
similarity index 100%
rename from stic/test/Generator/PageGeneratorTest.hs
rename to test/Generator/PageGeneratorTest.hs
diff --git a/stic/test/Parser/CommonTest.hs b/test/Parser/CommonTest.hs
similarity index 100%
rename from stic/test/Parser/CommonTest.hs
rename to test/Parser/CommonTest.hs
diff --git a/stic/test/Parser/EntityTest.hs b/test/Parser/EntityTest.hs
similarity index 100%
rename from stic/test/Parser/EntityTest.hs
rename to test/Parser/EntityTest.hs
diff --git a/stic/test/Parser/PageTest.hs b/test/Parser/PageTest.hs
similarity index 100%
rename from stic/test/Parser/PageTest.hs
rename to test/Parser/PageTest.hs
diff --git a/stic/test/Parser/ParserTest.hs b/test/Parser/ParserTest.hs
similarity index 100%
rename from stic/test/Parser/ParserTest.hs
rename to test/Parser/ParserTest.hs
diff --git a/stic/test/Parser/valid.wasp b/test/Parser/valid.wasp
similarity index 100%
rename from stic/test/Parser/valid.wasp
rename to test/Parser/valid.wasp
diff --git a/stic/test/TastyDiscoverDriver.hs b/test/TastyDiscoverDriver.hs
similarity index 100%
rename from stic/test/TastyDiscoverDriver.hs
rename to test/TastyDiscoverDriver.hs
diff --git a/stic/test/Util/FibTest.hs b/test/Util/FibTest.hs
similarity index 100%
rename from stic/test/Util/FibTest.hs
rename to test/Util/FibTest.hs
diff --git a/stic/test/UtilTest.hs b/test/UtilTest.hs
similarity index 100%
rename from stic/test/UtilTest.hs
rename to test/UtilTest.hs