diff --git a/.gitignore b/waspc/.gitignore
similarity index 100%
rename from .gitignore
rename to waspc/.gitignore
diff --git a/ChangeLog.md b/waspc/ChangeLog.md
similarity index 100%
rename from ChangeLog.md
rename to waspc/ChangeLog.md
diff --git a/LICENSE b/waspc/LICENSE
similarity index 100%
rename from LICENSE
rename to waspc/LICENSE
diff --git a/README.md b/waspc/README.md
similarity index 100%
rename from README.md
rename to waspc/README.md
diff --git a/Setup.hs b/waspc/Setup.hs
similarity index 100%
rename from Setup.hs
rename to waspc/Setup.hs
diff --git a/app/Main.hs b/waspc/app/Main.hs
similarity index 100%
rename from app/Main.hs
rename to waspc/app/Main.hs
diff --git a/benchmark/Main.hs b/waspc/benchmark/Main.hs
similarity index 100%
rename from benchmark/Main.hs
rename to waspc/benchmark/Main.hs
diff --git a/data/Generator/templates/react-app/README.md b/waspc/data/Generator/templates/react-app/README.md
similarity index 100%
rename from data/Generator/templates/react-app/README.md
rename to waspc/data/Generator/templates/react-app/README.md
diff --git a/data/Generator/templates/react-app/gitignore b/waspc/data/Generator/templates/react-app/gitignore
similarity index 100%
rename from data/Generator/templates/react-app/gitignore
rename to waspc/data/Generator/templates/react-app/gitignore
diff --git a/data/Generator/templates/react-app/package.json b/waspc/data/Generator/templates/react-app/package.json
similarity index 100%
rename from data/Generator/templates/react-app/package.json
rename to waspc/data/Generator/templates/react-app/package.json
diff --git a/data/Generator/templates/react-app/public/favicon.ico b/waspc/data/Generator/templates/react-app/public/favicon.ico
similarity index 100%
rename from data/Generator/templates/react-app/public/favicon.ico
rename to waspc/data/Generator/templates/react-app/public/favicon.ico
diff --git a/data/Generator/templates/react-app/public/index.html b/waspc/data/Generator/templates/react-app/public/index.html
similarity index 100%
rename from data/Generator/templates/react-app/public/index.html
rename to waspc/data/Generator/templates/react-app/public/index.html
diff --git a/data/Generator/templates/react-app/public/manifest.json b/waspc/data/Generator/templates/react-app/public/manifest.json
similarity index 100%
rename from data/Generator/templates/react-app/public/manifest.json
rename to waspc/data/Generator/templates/react-app/public/manifest.json
diff --git a/data/Generator/templates/react-app/src/_Page.js b/waspc/data/Generator/templates/react-app/src/_Page.js
similarity index 100%
rename from data/Generator/templates/react-app/src/_Page.js
rename to waspc/data/Generator/templates/react-app/src/_Page.js
diff --git a/data/Generator/templates/react-app/src/entities/_entity/_Entity.js b/waspc/data/Generator/templates/react-app/src/entities/_entity/_Entity.js
similarity index 100%
rename from data/Generator/templates/react-app/src/entities/_entity/_Entity.js
rename to waspc/data/Generator/templates/react-app/src/entities/_entity/_Entity.js
diff --git a/data/Generator/templates/react-app/src/entities/_entity/actionTypes.js b/waspc/data/Generator/templates/react-app/src/entities/_entity/actionTypes.js
similarity index 100%
rename from data/Generator/templates/react-app/src/entities/_entity/actionTypes.js
rename to waspc/data/Generator/templates/react-app/src/entities/_entity/actionTypes.js
diff --git a/data/Generator/templates/react-app/src/entities/_entity/actions.js b/waspc/data/Generator/templates/react-app/src/entities/_entity/actions.js
similarity index 100%
rename from data/Generator/templates/react-app/src/entities/_entity/actions.js
rename to waspc/data/Generator/templates/react-app/src/entities/_entity/actions.js
diff --git a/data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js b/waspc/data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js
similarity index 100%
rename from data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js
rename to waspc/data/Generator/templates/react-app/src/entities/_entity/components/CreateForm.js
diff --git a/data/Generator/templates/react-app/src/entities/_entity/components/List.js b/waspc/data/Generator/templates/react-app/src/entities/_entity/components/List.js
similarity index 100%
rename from data/Generator/templates/react-app/src/entities/_entity/components/List.js
rename to waspc/data/Generator/templates/react-app/src/entities/_entity/components/List.js
diff --git a/data/Generator/templates/react-app/src/entities/_entity/state.js b/waspc/data/Generator/templates/react-app/src/entities/_entity/state.js
similarity index 100%
rename from data/Generator/templates/react-app/src/entities/_entity/state.js
rename to waspc/data/Generator/templates/react-app/src/entities/_entity/state.js
diff --git a/data/Generator/templates/react-app/src/index.css b/waspc/data/Generator/templates/react-app/src/index.css
similarity index 100%
rename from data/Generator/templates/react-app/src/index.css
rename to waspc/data/Generator/templates/react-app/src/index.css
diff --git a/data/Generator/templates/react-app/src/index.js b/waspc/data/Generator/templates/react-app/src/index.js
similarity index 100%
rename from data/Generator/templates/react-app/src/index.js
rename to waspc/data/Generator/templates/react-app/src/index.js
diff --git a/data/Generator/templates/react-app/src/logo.png b/waspc/data/Generator/templates/react-app/src/logo.png
similarity index 100%
rename from data/Generator/templates/react-app/src/logo.png
rename to waspc/data/Generator/templates/react-app/src/logo.png
diff --git a/data/Generator/templates/react-app/src/reducers.js b/waspc/data/Generator/templates/react-app/src/reducers.js
similarity index 100%
rename from data/Generator/templates/react-app/src/reducers.js
rename to waspc/data/Generator/templates/react-app/src/reducers.js
diff --git a/data/Generator/templates/react-app/src/router.js b/waspc/data/Generator/templates/react-app/src/router.js
similarity index 100%
rename from data/Generator/templates/react-app/src/router.js
rename to waspc/data/Generator/templates/react-app/src/router.js
diff --git a/data/Generator/templates/react-app/src/serviceWorker.js b/waspc/data/Generator/templates/react-app/src/serviceWorker.js
similarity index 100%
rename from data/Generator/templates/react-app/src/serviceWorker.js
rename to waspc/data/Generator/templates/react-app/src/serviceWorker.js
diff --git a/data/Generator/templates/react-app/src/store/index.js b/waspc/data/Generator/templates/react-app/src/store/index.js
similarity index 100%
rename from data/Generator/templates/react-app/src/store/index.js
rename to waspc/data/Generator/templates/react-app/src/store/index.js
diff --git a/data/Generator/templates/react-app/src/store/middleware/logger.js b/waspc/data/Generator/templates/react-app/src/store/middleware/logger.js
similarity index 100%
rename from data/Generator/templates/react-app/src/store/middleware/logger.js
rename to waspc/data/Generator/templates/react-app/src/store/middleware/logger.js
diff --git a/examples/todoApp/ext/Main.css b/waspc/examples/todoApp/ext/Main.css
similarity index 100%
rename from examples/todoApp/ext/Main.css
rename to waspc/examples/todoApp/ext/Main.css
diff --git a/examples/todoApp/ext/Todo.js b/waspc/examples/todoApp/ext/Todo.js
similarity index 100%
rename from examples/todoApp/ext/Todo.js
rename to waspc/examples/todoApp/ext/Todo.js
diff --git a/examples/todoApp/todoApp.wasp b/waspc/examples/todoApp/todoApp.wasp
similarity index 100%
rename from examples/todoApp/todoApp.wasp
rename to waspc/examples/todoApp/todoApp.wasp
diff --git a/lang-design/todoApp.wasp b/waspc/lang-design/todoApp.wasp
similarity index 100%
rename from lang-design/todoApp.wasp
rename to waspc/lang-design/todoApp.wasp
diff --git a/package.yaml b/waspc/package.yaml
similarity index 100%
rename from package.yaml
rename to waspc/package.yaml
diff --git a/run b/waspc/run
similarity index 100%
rename from run
rename to waspc/run
diff --git a/src/CompileOptions.hs b/waspc/src/CompileOptions.hs
similarity index 100%
rename from src/CompileOptions.hs
rename to waspc/src/CompileOptions.hs
diff --git a/src/ExternalCode.hs b/waspc/src/ExternalCode.hs
similarity index 100%
rename from src/ExternalCode.hs
rename to waspc/src/ExternalCode.hs
diff --git a/src/Generator.hs b/waspc/src/Generator.hs
similarity index 100%
rename from src/Generator.hs
rename to waspc/src/Generator.hs
diff --git a/src/Generator/Common.hs b/waspc/src/Generator/Common.hs
similarity index 100%
rename from src/Generator/Common.hs
rename to waspc/src/Generator/Common.hs
diff --git a/src/Generator/Entity.hs b/waspc/src/Generator/Entity.hs
similarity index 100%
rename from src/Generator/Entity.hs
rename to waspc/src/Generator/Entity.hs
diff --git a/src/Generator/Entity/Common.hs b/waspc/src/Generator/Entity/Common.hs
similarity index 100%
rename from src/Generator/Entity/Common.hs
rename to waspc/src/Generator/Entity/Common.hs
diff --git a/src/Generator/Entity/EntityForm.hs b/waspc/src/Generator/Entity/EntityForm.hs
similarity index 100%
rename from src/Generator/Entity/EntityForm.hs
rename to waspc/src/Generator/Entity/EntityForm.hs
diff --git a/src/Generator/Entity/EntityList.hs b/waspc/src/Generator/Entity/EntityList.hs
similarity index 100%
rename from src/Generator/Entity/EntityList.hs
rename to waspc/src/Generator/Entity/EntityList.hs
diff --git a/src/Generator/ExternalCode.hs b/waspc/src/Generator/ExternalCode.hs
similarity index 100%
rename from src/Generator/ExternalCode.hs
rename to waspc/src/Generator/ExternalCode.hs
diff --git a/src/Generator/ExternalCode/Common.hs b/waspc/src/Generator/ExternalCode/Common.hs
similarity index 100%
rename from src/Generator/ExternalCode/Common.hs
rename to waspc/src/Generator/ExternalCode/Common.hs
diff --git a/src/Generator/ExternalCode/Js.hs b/waspc/src/Generator/ExternalCode/Js.hs
similarity index 100%
rename from src/Generator/ExternalCode/Js.hs
rename to waspc/src/Generator/ExternalCode/Js.hs
diff --git a/src/Generator/FileDraft.hs b/waspc/src/Generator/FileDraft.hs
similarity index 100%
rename from src/Generator/FileDraft.hs
rename to waspc/src/Generator/FileDraft.hs
diff --git a/src/Generator/FileDraft/CopyFileDraft.hs b/waspc/src/Generator/FileDraft/CopyFileDraft.hs
similarity index 100%
rename from src/Generator/FileDraft/CopyFileDraft.hs
rename to waspc/src/Generator/FileDraft/CopyFileDraft.hs
diff --git a/src/Generator/FileDraft/TemplateFileDraft.hs b/waspc/src/Generator/FileDraft/TemplateFileDraft.hs
similarity index 100%
rename from src/Generator/FileDraft/TemplateFileDraft.hs
rename to waspc/src/Generator/FileDraft/TemplateFileDraft.hs
diff --git a/src/Generator/FileDraft/TextFileDraft.hs b/waspc/src/Generator/FileDraft/TextFileDraft.hs
similarity index 100%
rename from src/Generator/FileDraft/TextFileDraft.hs
rename to waspc/src/Generator/FileDraft/TextFileDraft.hs
diff --git a/src/Generator/FileDraft/Writeable.hs b/waspc/src/Generator/FileDraft/Writeable.hs
similarity index 100%
rename from src/Generator/FileDraft/Writeable.hs
rename to waspc/src/Generator/FileDraft/Writeable.hs
diff --git a/src/Generator/FileDraft/WriteableMonad.hs b/waspc/src/Generator/FileDraft/WriteableMonad.hs
similarity index 100%
rename from src/Generator/FileDraft/WriteableMonad.hs
rename to waspc/src/Generator/FileDraft/WriteableMonad.hs
diff --git a/src/Generator/Generators.hs b/waspc/src/Generator/Generators.hs
similarity index 100%
rename from src/Generator/Generators.hs
rename to waspc/src/Generator/Generators.hs
diff --git a/src/Generator/PageGenerator.hs b/waspc/src/Generator/PageGenerator.hs
similarity index 100%
rename from src/Generator/PageGenerator.hs
rename to waspc/src/Generator/PageGenerator.hs
diff --git a/src/Generator/Templates.hs b/waspc/src/Generator/Templates.hs
similarity index 100%
rename from src/Generator/Templates.hs
rename to waspc/src/Generator/Templates.hs
diff --git a/src/Lexer.hs b/waspc/src/Lexer.hs
similarity index 100%
rename from src/Lexer.hs
rename to waspc/src/Lexer.hs
diff --git a/src/Lib.hs b/waspc/src/Lib.hs
similarity index 100%
rename from src/Lib.hs
rename to waspc/src/Lib.hs
diff --git a/src/Parser.hs b/waspc/src/Parser.hs
similarity index 100%
rename from src/Parser.hs
rename to waspc/src/Parser.hs
diff --git a/src/Parser/App.hs b/waspc/src/Parser/App.hs
similarity index 100%
rename from src/Parser/App.hs
rename to waspc/src/Parser/App.hs
diff --git a/src/Parser/Common.hs b/waspc/src/Parser/Common.hs
similarity index 100%
rename from src/Parser/Common.hs
rename to waspc/src/Parser/Common.hs
diff --git a/src/Parser/Entity.hs b/waspc/src/Parser/Entity.hs
similarity index 100%
rename from src/Parser/Entity.hs
rename to waspc/src/Parser/Entity.hs
diff --git a/src/Parser/Entity/Common.hs b/waspc/src/Parser/Entity/Common.hs
similarity index 100%
rename from src/Parser/Entity/Common.hs
rename to waspc/src/Parser/Entity/Common.hs
diff --git a/src/Parser/Entity/EntityForm.hs b/waspc/src/Parser/Entity/EntityForm.hs
similarity index 100%
rename from src/Parser/Entity/EntityForm.hs
rename to waspc/src/Parser/Entity/EntityForm.hs
diff --git a/src/Parser/Entity/EntityList.hs b/waspc/src/Parser/Entity/EntityList.hs
similarity index 100%
rename from src/Parser/Entity/EntityList.hs
rename to waspc/src/Parser/Entity/EntityList.hs
diff --git a/src/Parser/ExternalCode.hs b/waspc/src/Parser/ExternalCode.hs
similarity index 100%
rename from src/Parser/ExternalCode.hs
rename to waspc/src/Parser/ExternalCode.hs
diff --git a/src/Parser/JsCode.hs b/waspc/src/Parser/JsCode.hs
similarity index 100%
rename from src/Parser/JsCode.hs
rename to waspc/src/Parser/JsCode.hs
diff --git a/src/Parser/JsImport.hs b/waspc/src/Parser/JsImport.hs
similarity index 100%
rename from src/Parser/JsImport.hs
rename to waspc/src/Parser/JsImport.hs
diff --git a/src/Parser/Page.hs b/waspc/src/Parser/Page.hs
similarity index 100%
rename from src/Parser/Page.hs
rename to waspc/src/Parser/Page.hs
diff --git a/src/Parser/Style.hs b/waspc/src/Parser/Style.hs
similarity index 100%
rename from src/Parser/Style.hs
rename to waspc/src/Parser/Style.hs
diff --git a/src/Path/Aliases.hs b/waspc/src/Path/Aliases.hs
similarity index 100%
rename from src/Path/Aliases.hs
rename to waspc/src/Path/Aliases.hs
diff --git a/src/Path/Extra.hs b/waspc/src/Path/Extra.hs
similarity index 100%
rename from src/Path/Extra.hs
rename to waspc/src/Path/Extra.hs
diff --git a/src/Util.hs b/waspc/src/Util.hs
similarity index 100%
rename from src/Util.hs
rename to waspc/src/Util.hs
diff --git a/src/Util/Fib.hs b/waspc/src/Util/Fib.hs
similarity index 100%
rename from src/Util/Fib.hs
rename to waspc/src/Util/Fib.hs
diff --git a/src/Util/IO.hs b/waspc/src/Util/IO.hs
similarity index 100%
rename from src/Util/IO.hs
rename to waspc/src/Util/IO.hs
diff --git a/src/Wasp.hs b/waspc/src/Wasp.hs
similarity index 100%
rename from src/Wasp.hs
rename to waspc/src/Wasp.hs
diff --git a/src/Wasp/App.hs b/waspc/src/Wasp/App.hs
similarity index 100%
rename from src/Wasp/App.hs
rename to waspc/src/Wasp/App.hs
diff --git a/src/Wasp/Entity.hs b/waspc/src/Wasp/Entity.hs
similarity index 100%
rename from src/Wasp/Entity.hs
rename to waspc/src/Wasp/Entity.hs
diff --git a/src/Wasp/EntityForm.hs b/waspc/src/Wasp/EntityForm.hs
similarity index 100%
rename from src/Wasp/EntityForm.hs
rename to waspc/src/Wasp/EntityForm.hs
diff --git a/src/Wasp/EntityList.hs b/waspc/src/Wasp/EntityList.hs
similarity index 100%
rename from src/Wasp/EntityList.hs
rename to waspc/src/Wasp/EntityList.hs
diff --git a/src/Wasp/JsCode.hs b/waspc/src/Wasp/JsCode.hs
similarity index 100%
rename from src/Wasp/JsCode.hs
rename to waspc/src/Wasp/JsCode.hs
diff --git a/src/Wasp/JsImport.hs b/waspc/src/Wasp/JsImport.hs
similarity index 100%
rename from src/Wasp/JsImport.hs
rename to waspc/src/Wasp/JsImport.hs
diff --git a/src/Wasp/Page.hs b/waspc/src/Wasp/Page.hs
similarity index 100%
rename from src/Wasp/Page.hs
rename to waspc/src/Wasp/Page.hs
diff --git a/src/Wasp/Style.hs b/waspc/src/Wasp/Style.hs
similarity index 100%
rename from src/Wasp/Style.hs
rename to waspc/src/Wasp/Style.hs
diff --git a/stack.yaml b/waspc/stack.yaml
similarity index 100%
rename from stack.yaml
rename to waspc/stack.yaml
diff --git a/test/Fixtures.hs b/waspc/test/Fixtures.hs
similarity index 100%
rename from test/Fixtures.hs
rename to waspc/test/Fixtures.hs
diff --git a/test/Generator/Entity/EntityFormTest.hs b/waspc/test/Generator/Entity/EntityFormTest.hs
similarity index 100%
rename from test/Generator/Entity/EntityFormTest.hs
rename to waspc/test/Generator/Entity/EntityFormTest.hs
diff --git a/test/Generator/EntityTest.hs b/waspc/test/Generator/EntityTest.hs
similarity index 100%
rename from test/Generator/EntityTest.hs
rename to waspc/test/Generator/EntityTest.hs
diff --git a/test/Generator/ExternalCode/JsTest.hs b/waspc/test/Generator/ExternalCode/JsTest.hs
similarity index 100%
rename from test/Generator/ExternalCode/JsTest.hs
rename to waspc/test/Generator/ExternalCode/JsTest.hs
diff --git a/test/Generator/FileDraft/CopyFileDraftTest.hs b/waspc/test/Generator/FileDraft/CopyFileDraftTest.hs
similarity index 100%
rename from test/Generator/FileDraft/CopyFileDraftTest.hs
rename to waspc/test/Generator/FileDraft/CopyFileDraftTest.hs
diff --git a/test/Generator/FileDraft/TemplateFileDraftTest.hs b/waspc/test/Generator/FileDraft/TemplateFileDraftTest.hs
similarity index 100%
rename from test/Generator/FileDraft/TemplateFileDraftTest.hs
rename to waspc/test/Generator/FileDraft/TemplateFileDraftTest.hs
diff --git a/test/Generator/GeneratorsTest.hs b/waspc/test/Generator/GeneratorsTest.hs
similarity index 100%
rename from test/Generator/GeneratorsTest.hs
rename to waspc/test/Generator/GeneratorsTest.hs
diff --git a/test/Generator/MockWriteableMonad.hs b/waspc/test/Generator/MockWriteableMonad.hs
similarity index 100%
rename from test/Generator/MockWriteableMonad.hs
rename to waspc/test/Generator/MockWriteableMonad.hs
diff --git a/test/Generator/PageGeneratorTest.hs b/waspc/test/Generator/PageGeneratorTest.hs
similarity index 100%
rename from test/Generator/PageGeneratorTest.hs
rename to waspc/test/Generator/PageGeneratorTest.hs
diff --git a/test/Parser/CommonTest.hs b/waspc/test/Parser/CommonTest.hs
similarity index 100%
rename from test/Parser/CommonTest.hs
rename to waspc/test/Parser/CommonTest.hs
diff --git a/test/Parser/EntityFormTest.hs b/waspc/test/Parser/EntityFormTest.hs
similarity index 100%
rename from test/Parser/EntityFormTest.hs
rename to waspc/test/Parser/EntityFormTest.hs
diff --git a/test/Parser/EntityTest.hs b/waspc/test/Parser/EntityTest.hs
similarity index 100%
rename from test/Parser/EntityTest.hs
rename to waspc/test/Parser/EntityTest.hs
diff --git a/test/Parser/ExternalCodeTest.hs b/waspc/test/Parser/ExternalCodeTest.hs
similarity index 100%
rename from test/Parser/ExternalCodeTest.hs
rename to waspc/test/Parser/ExternalCodeTest.hs
diff --git a/test/Parser/JsImportTest.hs b/waspc/test/Parser/JsImportTest.hs
similarity index 100%
rename from test/Parser/JsImportTest.hs
rename to waspc/test/Parser/JsImportTest.hs
diff --git a/test/Parser/PageTest.hs b/waspc/test/Parser/PageTest.hs
similarity index 100%
rename from test/Parser/PageTest.hs
rename to waspc/test/Parser/PageTest.hs
diff --git a/test/Parser/ParserTest.hs b/waspc/test/Parser/ParserTest.hs
similarity index 100%
rename from test/Parser/ParserTest.hs
rename to waspc/test/Parser/ParserTest.hs
diff --git a/test/Parser/StyleTest.hs b/waspc/test/Parser/StyleTest.hs
similarity index 100%
rename from test/Parser/StyleTest.hs
rename to waspc/test/Parser/StyleTest.hs
diff --git a/test/Parser/valid.wasp b/waspc/test/Parser/valid.wasp
similarity index 100%
rename from test/Parser/valid.wasp
rename to waspc/test/Parser/valid.wasp
diff --git a/test/Path/ExtraTest.hs b/waspc/test/Path/ExtraTest.hs
similarity index 100%
rename from test/Path/ExtraTest.hs
rename to waspc/test/Path/ExtraTest.hs
diff --git a/test/TastyDiscoverDriver.hs b/waspc/test/TastyDiscoverDriver.hs
similarity index 100%
rename from test/TastyDiscoverDriver.hs
rename to waspc/test/TastyDiscoverDriver.hs
diff --git a/test/Util/FibTest.hs b/waspc/test/Util/FibTest.hs
similarity index 100%
rename from test/Util/FibTest.hs
rename to waspc/test/Util/FibTest.hs
diff --git a/test/UtilTest.hs b/waspc/test/UtilTest.hs
similarity index 100%
rename from test/UtilTest.hs
rename to waspc/test/UtilTest.hs
diff --git a/test/WaspTest.hs b/waspc/test/WaspTest.hs
similarity index 100%
rename from test/WaspTest.hs
rename to waspc/test/WaspTest.hs
diff --git a/testEnv.hs b/waspc/testEnv.hs
similarity index 100%
rename from testEnv.hs
rename to waspc/testEnv.hs