diff --git a/.gitmodules b/.gitmodules
index c8d0f675ef..d71137c0d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "scalachess"]
-	path = scalachess
+	path = modules/chess
 	url = git://github.com/ornicar/scalachess
 [submodule "play"]
 	path = play
diff --git a/ai/src/main/Ai.scala b/modules/ai/src/main/Ai.scala
similarity index 100%
rename from ai/src/main/Ai.scala
rename to modules/ai/src/main/Ai.scala
diff --git a/ai/src/main/Client.scala b/modules/ai/src/main/Client.scala
similarity index 100%
rename from ai/src/main/Client.scala
rename to modules/ai/src/main/Client.scala
diff --git a/ai/src/main/Env.scala b/modules/ai/src/main/Env.scala
similarity index 100%
rename from ai/src/main/Env.scala
rename to modules/ai/src/main/Env.scala
diff --git a/ai/src/main/StupidAi.scala b/modules/ai/src/main/StupidAi.scala
similarity index 100%
rename from ai/src/main/StupidAi.scala
rename to modules/ai/src/main/StupidAi.scala
diff --git a/ai/src/main/actorApi.scala b/modules/ai/src/main/actorApi.scala
similarity index 100%
rename from ai/src/main/actorApi.scala
rename to modules/ai/src/main/actorApi.scala
diff --git a/ai/src/main/package.scala b/modules/ai/src/main/package.scala
similarity index 100%
rename from ai/src/main/package.scala
rename to modules/ai/src/main/package.scala
diff --git a/ai/src/main/stockfish/ActorFSM.scala b/modules/ai/src/main/stockfish/ActorFSM.scala
similarity index 100%
rename from ai/src/main/stockfish/ActorFSM.scala
rename to modules/ai/src/main/stockfish/ActorFSM.scala
diff --git a/ai/src/main/stockfish/Ai.scala b/modules/ai/src/main/stockfish/Ai.scala
similarity index 100%
rename from ai/src/main/stockfish/Ai.scala
rename to modules/ai/src/main/stockfish/Ai.scala
diff --git a/ai/src/main/stockfish/AnalyseParser.scala b/modules/ai/src/main/stockfish/AnalyseParser.scala
similarity index 100%
rename from ai/src/main/stockfish/AnalyseParser.scala
rename to modules/ai/src/main/stockfish/AnalyseParser.scala
diff --git a/ai/src/main/stockfish/Client.scala b/modules/ai/src/main/stockfish/Client.scala
similarity index 100%
rename from ai/src/main/stockfish/Client.scala
rename to modules/ai/src/main/stockfish/Client.scala
diff --git a/ai/src/main/stockfish/Config.scala b/modules/ai/src/main/stockfish/Config.scala
similarity index 100%
rename from ai/src/main/stockfish/Config.scala
rename to modules/ai/src/main/stockfish/Config.scala
diff --git a/ai/src/main/stockfish/Process.scala b/modules/ai/src/main/stockfish/Process.scala
similarity index 100%
rename from ai/src/main/stockfish/Process.scala
rename to modules/ai/src/main/stockfish/Process.scala
diff --git a/ai/src/main/stockfish/Server.scala b/modules/ai/src/main/stockfish/Server.scala
similarity index 100%
rename from ai/src/main/stockfish/Server.scala
rename to modules/ai/src/main/stockfish/Server.scala
diff --git a/ai/src/main/stockfish/Stockfish.scala b/modules/ai/src/main/stockfish/Stockfish.scala
similarity index 100%
rename from ai/src/main/stockfish/Stockfish.scala
rename to modules/ai/src/main/stockfish/Stockfish.scala
diff --git a/ai/src/main/stockfish/model.scala b/modules/ai/src/main/stockfish/model.scala
similarity index 100%
rename from ai/src/main/stockfish/model.scala
rename to modules/ai/src/main/stockfish/model.scala
diff --git a/analyse/src/main/AdvantageChart.scala b/modules/analyse/src/main/AdvantageChart.scala
similarity index 100%
rename from analyse/src/main/AdvantageChart.scala
rename to modules/analyse/src/main/AdvantageChart.scala
diff --git a/analyse/src/main/Analyser.scala b/modules/analyse/src/main/Analyser.scala
similarity index 100%
rename from analyse/src/main/Analyser.scala
rename to modules/analyse/src/main/Analyser.scala
diff --git a/analyse/src/main/Analysis.scala b/modules/analyse/src/main/Analysis.scala
similarity index 100%
rename from analyse/src/main/Analysis.scala
rename to modules/analyse/src/main/Analysis.scala
diff --git a/analyse/src/main/AnalysisRepo.scala b/modules/analyse/src/main/AnalysisRepo.scala
similarity index 100%
rename from analyse/src/main/AnalysisRepo.scala
rename to modules/analyse/src/main/AnalysisRepo.scala
diff --git a/analyse/src/main/Annotator.scala b/modules/analyse/src/main/Annotator.scala
similarity index 100%
rename from analyse/src/main/Annotator.scala
rename to modules/analyse/src/main/Annotator.scala
diff --git a/analyse/src/main/Env.scala b/modules/analyse/src/main/Env.scala
similarity index 100%
rename from analyse/src/main/Env.scala
rename to modules/analyse/src/main/Env.scala
diff --git a/analyse/src/main/PaginatorBuilder.scala b/modules/analyse/src/main/PaginatorBuilder.scala
similarity index 100%
rename from analyse/src/main/PaginatorBuilder.scala
rename to modules/analyse/src/main/PaginatorBuilder.scala
diff --git a/analyse/src/main/TimeChart.scala b/modules/analyse/src/main/TimeChart.scala
similarity index 100%
rename from analyse/src/main/TimeChart.scala
rename to modules/analyse/src/main/TimeChart.scala
diff --git a/analyse/src/main/TimePie.scala b/modules/analyse/src/main/TimePie.scala
similarity index 100%
rename from analyse/src/main/TimePie.scala
rename to modules/analyse/src/main/TimePie.scala
diff --git a/analyse/src/main/model.scala b/modules/analyse/src/main/model.scala
similarity index 100%
rename from analyse/src/main/model.scala
rename to modules/analyse/src/main/model.scala
diff --git a/analyse/src/main/package.scala b/modules/analyse/src/main/package.scala
similarity index 100%
rename from analyse/src/main/package.scala
rename to modules/analyse/src/main/package.scala
diff --git a/api/src/main/Cli.scala b/modules/api/src/main/Cli.scala
similarity index 100%
rename from api/src/main/Cli.scala
rename to modules/api/src/main/Cli.scala
diff --git a/api/src/main/Env.scala b/modules/api/src/main/Env.scala
similarity index 100%
rename from api/src/main/Env.scala
rename to modules/api/src/main/Env.scala
diff --git a/api/src/main/package.scala b/modules/api/src/main/package.scala
similarity index 100%
rename from api/src/main/package.scala
rename to modules/api/src/main/package.scala
diff --git a/bookmark/src/main/BookmarkApi.scala b/modules/bookmark/src/main/BookmarkApi.scala
similarity index 100%
rename from bookmark/src/main/BookmarkApi.scala
rename to modules/bookmark/src/main/BookmarkApi.scala
diff --git a/bookmark/src/main/BookmarkRepo.scala b/modules/bookmark/src/main/BookmarkRepo.scala
similarity index 100%
rename from bookmark/src/main/BookmarkRepo.scala
rename to modules/bookmark/src/main/BookmarkRepo.scala
diff --git a/bookmark/src/main/Cached.scala b/modules/bookmark/src/main/Cached.scala
similarity index 100%
rename from bookmark/src/main/Cached.scala
rename to modules/bookmark/src/main/Cached.scala
diff --git a/bookmark/src/main/Env.scala b/modules/bookmark/src/main/Env.scala
similarity index 100%
rename from bookmark/src/main/Env.scala
rename to modules/bookmark/src/main/Env.scala
diff --git a/bookmark/src/main/PaginatorBuilder.scala b/modules/bookmark/src/main/PaginatorBuilder.scala
similarity index 100%
rename from bookmark/src/main/PaginatorBuilder.scala
rename to modules/bookmark/src/main/PaginatorBuilder.scala
diff --git a/bookmark/src/main/package.scala b/modules/bookmark/src/main/package.scala
similarity index 100%
rename from bookmark/src/main/package.scala
rename to modules/bookmark/src/main/package.scala
diff --git a/bookmark/src/test/RepoTest.scala b/modules/bookmark/src/test/RepoTest.scala
similarity index 100%
rename from bookmark/src/test/RepoTest.scala
rename to modules/bookmark/src/test/RepoTest.scala
diff --git a/scalachess b/modules/chess
similarity index 100%
rename from scalachess
rename to modules/chess
diff --git a/common/src/main/Captcha.scala b/modules/common/src/main/Captcha.scala
similarity index 100%
rename from common/src/main/Captcha.scala
rename to modules/common/src/main/Captcha.scala
diff --git a/common/src/main/Cli.scala b/modules/common/src/main/Cli.scala
similarity index 100%
rename from common/src/main/Cli.scala
rename to modules/common/src/main/Cli.scala
diff --git a/common/src/main/CsvServer.scala b/modules/common/src/main/CsvServer.scala
similarity index 100%
rename from common/src/main/CsvServer.scala
rename to modules/common/src/main/CsvServer.scala
diff --git a/common/src/main/EloRange.scala b/modules/common/src/main/EloRange.scala
similarity index 100%
rename from common/src/main/EloRange.scala
rename to modules/common/src/main/EloRange.scala
diff --git a/common/src/main/Form.scala b/modules/common/src/main/Form.scala
similarity index 100%
rename from common/src/main/Form.scala
rename to modules/common/src/main/Form.scala
diff --git a/common/src/main/PackageObject.scala b/modules/common/src/main/PackageObject.scala
similarity index 100%
rename from common/src/main/PackageObject.scala
rename to modules/common/src/main/PackageObject.scala
diff --git a/common/src/main/PimpedConfig.scala b/modules/common/src/main/PimpedConfig.scala
similarity index 100%
rename from common/src/main/PimpedConfig.scala
rename to modules/common/src/main/PimpedConfig.scala
diff --git a/common/src/main/PimpedJson.scala b/modules/common/src/main/PimpedJson.scala
similarity index 100%
rename from common/src/main/PimpedJson.scala
rename to modules/common/src/main/PimpedJson.scala
diff --git a/common/src/main/PlayApp.scala b/modules/common/src/main/PlayApp.scala
similarity index 100%
rename from common/src/main/PlayApp.scala
rename to modules/common/src/main/PlayApp.scala
diff --git a/common/src/main/String.scala b/modules/common/src/main/String.scala
similarity index 100%
rename from common/src/main/String.scala
rename to modules/common/src/main/String.scala
diff --git a/common/src/main/package.scala b/modules/common/src/main/package.scala
similarity index 100%
rename from common/src/main/package.scala
rename to modules/common/src/main/package.scala
diff --git a/common/src/main/paginator/Adapter.scala b/modules/common/src/main/paginator/Adapter.scala
similarity index 100%
rename from common/src/main/paginator/Adapter.scala
rename to modules/common/src/main/paginator/Adapter.scala
diff --git a/common/src/main/paginator/Paginator.scala b/modules/common/src/main/paginator/Paginator.scala
similarity index 100%
rename from common/src/main/paginator/Paginator.scala
rename to modules/common/src/main/paginator/Paginator.scala
diff --git a/common/src/main/paginator/package.scala b/modules/common/src/main/paginator/package.scala
similarity index 100%
rename from common/src/main/paginator/package.scala
rename to modules/common/src/main/paginator/package.scala
diff --git a/db/src/main/Env.scala b/modules/db/src/main/Env.scala
similarity index 100%
rename from db/src/main/Env.scala
rename to modules/db/src/main/Env.scala
diff --git a/db/src/main/PaginatorAdapter.scala b/modules/db/src/main/PaginatorAdapter.scala
similarity index 100%
rename from db/src/main/PaginatorAdapter.scala
rename to modules/db/src/main/PaginatorAdapter.scala
diff --git a/db/src/main/Tube.scala b/modules/db/src/main/Tube.scala
similarity index 100%
rename from db/src/main/Tube.scala
rename to modules/db/src/main/Tube.scala
diff --git a/db/src/main/api/count.scala b/modules/db/src/main/api/count.scala
similarity index 100%
rename from db/src/main/api/count.scala
rename to modules/db/src/main/api/count.scala
diff --git a/db/src/main/api/cursor.scala b/modules/db/src/main/api/cursor.scala
similarity index 100%
rename from db/src/main/api/cursor.scala
rename to modules/db/src/main/api/cursor.scala
diff --git a/db/src/main/api/find.scala b/modules/db/src/main/api/find.scala
similarity index 100%
rename from db/src/main/api/find.scala
rename to modules/db/src/main/api/find.scala
diff --git a/db/src/main/api/insert.scala b/modules/db/src/main/api/insert.scala
similarity index 100%
rename from db/src/main/api/insert.scala
rename to modules/db/src/main/api/insert.scala
diff --git a/db/src/main/api/operator.scala b/modules/db/src/main/api/operator.scala
similarity index 100%
rename from db/src/main/api/operator.scala
rename to modules/db/src/main/api/operator.scala
diff --git a/db/src/main/api/package.scala b/modules/db/src/main/api/package.scala
similarity index 100%
rename from db/src/main/api/package.scala
rename to modules/db/src/main/api/package.scala
diff --git a/db/src/main/api/primitive.scala b/modules/db/src/main/api/primitive.scala
similarity index 100%
rename from db/src/main/api/primitive.scala
rename to modules/db/src/main/api/primitive.scala
diff --git a/db/src/main/api/projection.scala b/modules/db/src/main/api/projection.scala
similarity index 100%
rename from db/src/main/api/projection.scala
rename to modules/db/src/main/api/projection.scala
diff --git a/db/src/main/api/query.scala b/modules/db/src/main/api/query.scala
similarity index 100%
rename from db/src/main/api/query.scala
rename to modules/db/src/main/api/query.scala
diff --git a/db/src/main/api/remove.scala b/modules/db/src/main/api/remove.scala
similarity index 100%
rename from db/src/main/api/remove.scala
rename to modules/db/src/main/api/remove.scala
diff --git a/db/src/main/api/save.scala b/modules/db/src/main/api/save.scala
similarity index 100%
rename from db/src/main/api/save.scala
rename to modules/db/src/main/api/save.scala
diff --git a/db/src/main/api/select.scala b/modules/db/src/main/api/select.scala
similarity index 100%
rename from db/src/main/api/select.scala
rename to modules/db/src/main/api/select.scala
diff --git a/db/src/main/api/sort.scala b/modules/db/src/main/api/sort.scala
similarity index 100%
rename from db/src/main/api/sort.scala
rename to modules/db/src/main/api/sort.scala
diff --git a/db/src/main/api/update.scala b/modules/db/src/main/api/update.scala
similarity index 100%
rename from db/src/main/api/update.scala
rename to modules/db/src/main/api/update.scala
diff --git a/db/src/main/package.scala b/modules/db/src/main/package.scala
similarity index 100%
rename from db/src/main/package.scala
rename to modules/db/src/main/package.scala
diff --git a/db/src/main/test/WithDb.scala b/modules/db/src/main/test/WithDb.scala
similarity index 100%
rename from db/src/main/test/WithDb.scala
rename to modules/db/src/main/test/WithDb.scala
diff --git a/db/src/main/test/WithTestColl.scala b/modules/db/src/main/test/WithTestColl.scala
similarity index 100%
rename from db/src/main/test/WithTestColl.scala
rename to modules/db/src/main/test/WithTestColl.scala
diff --git a/db/src/main/typesAndImplicits.scala b/modules/db/src/main/typesAndImplicits.scala
similarity index 100%
rename from db/src/main/typesAndImplicits.scala
rename to modules/db/src/main/typesAndImplicits.scala
diff --git a/db/src/test/DateTest.scala b/modules/db/src/test/DateTest.scala
similarity index 100%
rename from db/src/test/DateTest.scala
rename to modules/db/src/test/DateTest.scala
diff --git a/db/src/test/DbApiTest.scala b/modules/db/src/test/DbApiTest.scala
similarity index 100%
rename from db/src/test/DbApiTest.scala
rename to modules/db/src/test/DbApiTest.scala
diff --git a/forum/src/main/Categ.scala b/modules/forum/src/main/Categ.scala
similarity index 100%
rename from forum/src/main/Categ.scala
rename to modules/forum/src/main/Categ.scala
diff --git a/forum/src/main/CategApi.scala b/modules/forum/src/main/CategApi.scala
similarity index 100%
rename from forum/src/main/CategApi.scala
rename to modules/forum/src/main/CategApi.scala
diff --git a/forum/src/main/CategRepo.scala b/modules/forum/src/main/CategRepo.scala
similarity index 100%
rename from forum/src/main/CategRepo.scala
rename to modules/forum/src/main/CategRepo.scala
diff --git a/forum/src/main/DataForm.scala b/modules/forum/src/main/DataForm.scala
similarity index 100%
rename from forum/src/main/DataForm.scala
rename to modules/forum/src/main/DataForm.scala
diff --git a/forum/src/main/Env.scala b/modules/forum/src/main/Env.scala
similarity index 100%
rename from forum/src/main/Env.scala
rename to modules/forum/src/main/Env.scala
diff --git a/forum/src/main/Granter.scala b/modules/forum/src/main/Granter.scala
similarity index 100%
rename from forum/src/main/Granter.scala
rename to modules/forum/src/main/Granter.scala
diff --git a/forum/src/main/Post.scala b/modules/forum/src/main/Post.scala
similarity index 100%
rename from forum/src/main/Post.scala
rename to modules/forum/src/main/Post.scala
diff --git a/forum/src/main/PostApi.scala b/modules/forum/src/main/PostApi.scala
similarity index 100%
rename from forum/src/main/PostApi.scala
rename to modules/forum/src/main/PostApi.scala
diff --git a/forum/src/main/PostRepo.scala b/modules/forum/src/main/PostRepo.scala
similarity index 100%
rename from forum/src/main/PostRepo.scala
rename to modules/forum/src/main/PostRepo.scala
diff --git a/forum/src/main/Recent.scala b/modules/forum/src/main/Recent.scala
similarity index 100%
rename from forum/src/main/Recent.scala
rename to modules/forum/src/main/Recent.scala
diff --git a/forum/src/main/Topic.scala b/modules/forum/src/main/Topic.scala
similarity index 100%
rename from forum/src/main/Topic.scala
rename to modules/forum/src/main/Topic.scala
diff --git a/forum/src/main/TopicApi.scala b/modules/forum/src/main/TopicApi.scala
similarity index 100%
rename from forum/src/main/TopicApi.scala
rename to modules/forum/src/main/TopicApi.scala
diff --git a/forum/src/main/TopicRepo.scala b/modules/forum/src/main/TopicRepo.scala
similarity index 100%
rename from forum/src/main/TopicRepo.scala
rename to modules/forum/src/main/TopicRepo.scala
diff --git a/forum/src/main/actorApi.scala b/modules/forum/src/main/actorApi.scala
similarity index 100%
rename from forum/src/main/actorApi.scala
rename to modules/forum/src/main/actorApi.scala
diff --git a/forum/src/main/package.scala b/modules/forum/src/main/package.scala
similarity index 100%
rename from forum/src/main/package.scala
rename to modules/forum/src/main/package.scala
diff --git a/forum/src/main/views.scala b/modules/forum/src/main/views.scala
similarity index 100%
rename from forum/src/main/views.scala
rename to modules/forum/src/main/views.scala
diff --git a/forumSearch/src/main/Env.scala b/modules/forumSearch/src/main/Env.scala
similarity index 100%
rename from forumSearch/src/main/Env.scala
rename to modules/forumSearch/src/main/Env.scala
diff --git a/forumSearch/src/main/Indexer.scala b/modules/forumSearch/src/main/Indexer.scala
similarity index 100%
rename from forumSearch/src/main/Indexer.scala
rename to modules/forumSearch/src/main/Indexer.scala
diff --git a/forumSearch/src/main/Post.scala b/modules/forumSearch/src/main/Post.scala
similarity index 100%
rename from forumSearch/src/main/Post.scala
rename to modules/forumSearch/src/main/Post.scala
diff --git a/forumSearch/src/main/Query.scala b/modules/forumSearch/src/main/Query.scala
similarity index 100%
rename from forumSearch/src/main/Query.scala
rename to modules/forumSearch/src/main/Query.scala
diff --git a/forumSearch/src/main/package.scala b/modules/forumSearch/src/main/package.scala
similarity index 100%
rename from forumSearch/src/main/package.scala
rename to modules/forumSearch/src/main/package.scala
diff --git a/game/src/main/Cached.scala b/modules/game/src/main/Cached.scala
similarity index 100%
rename from game/src/main/Cached.scala
rename to modules/game/src/main/Cached.scala
diff --git a/game/src/main/Captcher.scala b/modules/game/src/main/Captcher.scala
similarity index 100%
rename from game/src/main/Captcher.scala
rename to modules/game/src/main/Captcher.scala
diff --git a/game/src/main/Env.scala b/modules/game/src/main/Env.scala
similarity index 100%
rename from game/src/main/Env.scala
rename to modules/game/src/main/Env.scala
diff --git a/game/src/main/Event.scala b/modules/game/src/main/Event.scala
similarity index 100%
rename from game/src/main/Event.scala
rename to modules/game/src/main/Event.scala
diff --git a/game/src/main/Export.scala b/modules/game/src/main/Export.scala
similarity index 100%
rename from game/src/main/Export.scala
rename to modules/game/src/main/Export.scala
diff --git a/game/src/main/Featured.scala b/modules/game/src/main/Featured.scala
similarity index 100%
rename from game/src/main/Featured.scala
rename to modules/game/src/main/Featured.scala
diff --git a/game/src/main/Game.scala b/modules/game/src/main/Game.scala
similarity index 100%
rename from game/src/main/Game.scala
rename to modules/game/src/main/Game.scala
diff --git a/game/src/main/GameDiff.scala b/modules/game/src/main/GameDiff.scala
similarity index 100%
rename from game/src/main/GameDiff.scala
rename to modules/game/src/main/GameDiff.scala
diff --git a/game/src/main/GameJs.scala b/modules/game/src/main/GameJs.scala
similarity index 100%
rename from game/src/main/GameJs.scala
rename to modules/game/src/main/GameJs.scala
diff --git a/game/src/main/GameRepo.scala b/modules/game/src/main/GameRepo.scala
similarity index 100%
rename from game/src/main/GameRepo.scala
rename to modules/game/src/main/GameRepo.scala
diff --git a/game/src/main/Handler.scala b/modules/game/src/main/Handler.scala
similarity index 100%
rename from game/src/main/Handler.scala
rename to modules/game/src/main/Handler.scala
diff --git a/game/src/main/IdGenerator.scala b/modules/game/src/main/IdGenerator.scala
similarity index 100%
rename from game/src/main/IdGenerator.scala
rename to modules/game/src/main/IdGenerator.scala
diff --git a/game/src/main/ListMenu.scala b/modules/game/src/main/ListMenu.scala
similarity index 100%
rename from game/src/main/ListMenu.scala
rename to modules/game/src/main/ListMenu.scala
diff --git a/game/src/main/Metadata.scala b/modules/game/src/main/Metadata.scala
similarity index 100%
rename from game/src/main/Metadata.scala
rename to modules/game/src/main/Metadata.scala
diff --git a/game/src/main/MoveTime.scala b/modules/game/src/main/MoveTime.scala
similarity index 100%
rename from game/src/main/MoveTime.scala
rename to modules/game/src/main/MoveTime.scala
diff --git a/game/src/main/Namer.scala b/modules/game/src/main/Namer.scala
similarity index 100%
rename from game/src/main/Namer.scala
rename to modules/game/src/main/Namer.scala
diff --git a/game/src/main/PaginatorBuilder.scala b/modules/game/src/main/PaginatorBuilder.scala
similarity index 100%
rename from game/src/main/PaginatorBuilder.scala
rename to modules/game/src/main/PaginatorBuilder.scala
diff --git a/game/src/main/PgnDump.scala b/modules/game/src/main/PgnDump.scala
similarity index 100%
rename from game/src/main/PgnDump.scala
rename to modules/game/src/main/PgnDump.scala
diff --git a/game/src/main/PgnRepo.scala b/modules/game/src/main/PgnRepo.scala
similarity index 100%
rename from game/src/main/PgnRepo.scala
rename to modules/game/src/main/PgnRepo.scala
diff --git a/game/src/main/Player.scala b/modules/game/src/main/Player.scala
similarity index 100%
rename from game/src/main/Player.scala
rename to modules/game/src/main/Player.scala
diff --git a/game/src/main/Pov.scala b/modules/game/src/main/Pov.scala
similarity index 100%
rename from game/src/main/Pov.scala
rename to modules/game/src/main/Pov.scala
diff --git a/game/src/main/Progress.scala b/modules/game/src/main/Progress.scala
similarity index 100%
rename from game/src/main/Progress.scala
rename to modules/game/src/main/Progress.scala
diff --git a/game/src/main/Query.scala b/modules/game/src/main/Query.scala
similarity index 100%
rename from game/src/main/Query.scala
rename to modules/game/src/main/Query.scala
diff --git a/game/src/main/RawClock.scala b/modules/game/src/main/RawClock.scala
similarity index 100%
rename from game/src/main/RawClock.scala
rename to modules/game/src/main/RawClock.scala
diff --git a/game/src/main/Rewind.scala b/modules/game/src/main/Rewind.scala
similarity index 100%
rename from game/src/main/Rewind.scala
rename to modules/game/src/main/Rewind.scala
diff --git a/game/src/main/Source.scala b/modules/game/src/main/Source.scala
similarity index 100%
rename from game/src/main/Source.scala
rename to modules/game/src/main/Source.scala
diff --git a/game/src/main/actorApi.scala b/modules/game/src/main/actorApi.scala
similarity index 100%
rename from game/src/main/actorApi.scala
rename to modules/game/src/main/actorApi.scala
diff --git a/game/src/main/package.scala b/modules/game/src/main/package.scala
similarity index 100%
rename from game/src/main/package.scala
rename to modules/game/src/main/package.scala
diff --git a/gameSearch/src/main/DataForm.scala b/modules/gameSearch/src/main/DataForm.scala
similarity index 100%
rename from gameSearch/src/main/DataForm.scala
rename to modules/gameSearch/src/main/DataForm.scala
diff --git a/gameSearch/src/main/Env.scala b/modules/gameSearch/src/main/Env.scala
similarity index 100%
rename from gameSearch/src/main/Env.scala
rename to modules/gameSearch/src/main/Env.scala
diff --git a/gameSearch/src/main/Game.scala b/modules/gameSearch/src/main/Game.scala
similarity index 100%
rename from gameSearch/src/main/Game.scala
rename to modules/gameSearch/src/main/Game.scala
diff --git a/gameSearch/src/main/Indexer.scala b/modules/gameSearch/src/main/Indexer.scala
similarity index 100%
rename from gameSearch/src/main/Indexer.scala
rename to modules/gameSearch/src/main/Indexer.scala
diff --git a/gameSearch/src/main/Query.scala b/modules/gameSearch/src/main/Query.scala
similarity index 100%
rename from gameSearch/src/main/Query.scala
rename to modules/gameSearch/src/main/Query.scala
diff --git a/gameSearch/src/main/Sorting.scala b/modules/gameSearch/src/main/Sorting.scala
similarity index 100%
rename from gameSearch/src/main/Sorting.scala
rename to modules/gameSearch/src/main/Sorting.scala
diff --git a/gameSearch/src/main/package.scala b/modules/gameSearch/src/main/package.scala
similarity index 100%
rename from gameSearch/src/main/package.scala
rename to modules/gameSearch/src/main/package.scala
diff --git a/http/src/main/LilaCookie.scala b/modules/http/src/main/LilaCookie.scala
similarity index 100%
rename from http/src/main/LilaCookie.scala
rename to modules/http/src/main/LilaCookie.scala
diff --git a/http/src/main/package.scala b/modules/http/src/main/package.scala
similarity index 100%
rename from http/src/main/package.scala
rename to modules/http/src/main/package.scala
diff --git a/hub/src/main/Broadcast.scala b/modules/hub/src/main/Broadcast.scala
similarity index 100%
rename from hub/src/main/Broadcast.scala
rename to modules/hub/src/main/Broadcast.scala
diff --git a/hub/src/main/CaptchedForm.scala b/modules/hub/src/main/CaptchedForm.scala
similarity index 100%
rename from hub/src/main/CaptchedForm.scala
rename to modules/hub/src/main/CaptchedForm.scala
diff --git a/hub/src/main/Env.scala b/modules/hub/src/main/Env.scala
similarity index 100%
rename from hub/src/main/Env.scala
rename to modules/hub/src/main/Env.scala
diff --git a/hub/src/main/actorApi.scala b/modules/hub/src/main/actorApi.scala
similarity index 100%
rename from hub/src/main/actorApi.scala
rename to modules/hub/src/main/actorApi.scala
diff --git a/hub/src/main/package.scala b/modules/hub/src/main/package.scala
similarity index 100%
rename from hub/src/main/package.scala
rename to modules/hub/src/main/package.scala
diff --git a/i18n/src/main/Contributors.scala b/modules/i18n/src/main/Contributors.scala
similarity index 100%
rename from i18n/src/main/Contributors.scala
rename to modules/i18n/src/main/Contributors.scala
diff --git a/i18n/src/main/DataForm.scala b/modules/i18n/src/main/DataForm.scala
similarity index 100%
rename from i18n/src/main/DataForm.scala
rename to modules/i18n/src/main/DataForm.scala
diff --git a/i18n/src/main/Env.scala b/modules/i18n/src/main/Env.scala
similarity index 100%
rename from i18n/src/main/Env.scala
rename to modules/i18n/src/main/Env.scala
diff --git a/i18n/src/main/FileFix.scala b/modules/i18n/src/main/FileFix.scala
similarity index 100%
rename from i18n/src/main/FileFix.scala
rename to modules/i18n/src/main/FileFix.scala
diff --git a/i18n/src/main/GitWrite.scala b/modules/i18n/src/main/GitWrite.scala
similarity index 100%
rename from i18n/src/main/GitWrite.scala
rename to modules/i18n/src/main/GitWrite.scala
diff --git a/i18n/src/main/I18nDomain.scala b/modules/i18n/src/main/I18nDomain.scala
similarity index 100%
rename from i18n/src/main/I18nDomain.scala
rename to modules/i18n/src/main/I18nDomain.scala
diff --git a/i18n/src/main/I18nKey.scala b/modules/i18n/src/main/I18nKey.scala
similarity index 100%
rename from i18n/src/main/I18nKey.scala
rename to modules/i18n/src/main/I18nKey.scala
diff --git a/i18n/src/main/I18nKeys.scala b/modules/i18n/src/main/I18nKeys.scala
similarity index 100%
rename from i18n/src/main/I18nKeys.scala
rename to modules/i18n/src/main/I18nKeys.scala
diff --git a/i18n/src/main/I18nPool.scala b/modules/i18n/src/main/I18nPool.scala
similarity index 100%
rename from i18n/src/main/I18nPool.scala
rename to modules/i18n/src/main/I18nPool.scala
diff --git a/i18n/src/main/I18nRequestHandler.scala b/modules/i18n/src/main/I18nRequestHandler.scala
similarity index 100%
rename from i18n/src/main/I18nRequestHandler.scala
rename to modules/i18n/src/main/I18nRequestHandler.scala
diff --git a/i18n/src/main/JsDump.scala b/modules/i18n/src/main/JsDump.scala
similarity index 100%
rename from i18n/src/main/JsDump.scala
rename to modules/i18n/src/main/JsDump.scala
diff --git a/i18n/src/main/LangList.scala b/modules/i18n/src/main/LangList.scala
similarity index 100%
rename from i18n/src/main/LangList.scala
rename to modules/i18n/src/main/LangList.scala
diff --git a/i18n/src/main/TransInfo.scala b/modules/i18n/src/main/TransInfo.scala
similarity index 100%
rename from i18n/src/main/TransInfo.scala
rename to modules/i18n/src/main/TransInfo.scala
diff --git a/i18n/src/main/Translation.scala b/modules/i18n/src/main/Translation.scala
similarity index 100%
rename from i18n/src/main/Translation.scala
rename to modules/i18n/src/main/Translation.scala
diff --git a/i18n/src/main/TranslationRepo.scala b/modules/i18n/src/main/TranslationRepo.scala
similarity index 100%
rename from i18n/src/main/TranslationRepo.scala
rename to modules/i18n/src/main/TranslationRepo.scala
diff --git a/i18n/src/main/Translator.scala b/modules/i18n/src/main/Translator.scala
similarity index 100%
rename from i18n/src/main/Translator.scala
rename to modules/i18n/src/main/Translator.scala
diff --git a/i18n/src/main/UpstreamFetch.scala b/modules/i18n/src/main/UpstreamFetch.scala
similarity index 100%
rename from i18n/src/main/UpstreamFetch.scala
rename to modules/i18n/src/main/UpstreamFetch.scala
diff --git a/i18n/src/main/package.scala b/modules/i18n/src/main/package.scala
similarity index 100%
rename from i18n/src/main/package.scala
rename to modules/i18n/src/main/package.scala
diff --git a/importer/src/main/DataForm.scala b/modules/importer/src/main/DataForm.scala
similarity index 100%
rename from importer/src/main/DataForm.scala
rename to modules/importer/src/main/DataForm.scala
diff --git a/importer/src/main/Env.scala b/modules/importer/src/main/Env.scala
similarity index 100%
rename from importer/src/main/Env.scala
rename to modules/importer/src/main/Env.scala
diff --git a/importer/src/main/Importer.scala b/modules/importer/src/main/Importer.scala
similarity index 100%
rename from importer/src/main/Importer.scala
rename to modules/importer/src/main/Importer.scala
diff --git a/importer/src/main/package.scala b/modules/importer/src/main/package.scala
similarity index 100%
rename from importer/src/main/package.scala
rename to modules/importer/src/main/package.scala
diff --git a/lobby/src/main/Color.scala b/modules/lobby/src/main/Color.scala
similarity index 100%
rename from lobby/src/main/Color.scala
rename to modules/lobby/src/main/Color.scala
diff --git a/lobby/src/main/Env.scala b/modules/lobby/src/main/Env.scala
similarity index 100%
rename from lobby/src/main/Env.scala
rename to modules/lobby/src/main/Env.scala
diff --git a/lobby/src/main/Fisherman.scala b/modules/lobby/src/main/Fisherman.scala
similarity index 100%
rename from lobby/src/main/Fisherman.scala
rename to modules/lobby/src/main/Fisherman.scala
diff --git a/lobby/src/main/Hook.scala b/modules/lobby/src/main/Hook.scala
similarity index 100%
rename from lobby/src/main/Hook.scala
rename to modules/lobby/src/main/Hook.scala
diff --git a/lobby/src/main/HookRepo.scala b/modules/lobby/src/main/HookRepo.scala
similarity index 100%
rename from lobby/src/main/HookRepo.scala
rename to modules/lobby/src/main/HookRepo.scala
diff --git a/lobby/src/main/Message.scala b/modules/lobby/src/main/Message.scala
similarity index 100%
rename from lobby/src/main/Message.scala
rename to modules/lobby/src/main/Message.scala
diff --git a/lobby/src/main/MessageRepo.scala b/modules/lobby/src/main/MessageRepo.scala
similarity index 100%
rename from lobby/src/main/MessageRepo.scala
rename to modules/lobby/src/main/MessageRepo.scala
diff --git a/lobby/src/main/Messenger.scala b/modules/lobby/src/main/Messenger.scala
similarity index 100%
rename from lobby/src/main/Messenger.scala
rename to modules/lobby/src/main/Messenger.scala
diff --git a/lobby/src/main/Socket.scala b/modules/lobby/src/main/Socket.scala
similarity index 100%
rename from lobby/src/main/Socket.scala
rename to modules/lobby/src/main/Socket.scala
diff --git a/lobby/src/main/SocketHandler.scala b/modules/lobby/src/main/SocketHandler.scala
similarity index 100%
rename from lobby/src/main/SocketHandler.scala
rename to modules/lobby/src/main/SocketHandler.scala
diff --git a/lobby/src/main/actorApi.scala b/modules/lobby/src/main/actorApi.scala
similarity index 100%
rename from lobby/src/main/actorApi.scala
rename to modules/lobby/src/main/actorApi.scala
diff --git a/lobby/src/main/package.scala b/modules/lobby/src/main/package.scala
similarity index 100%
rename from lobby/src/main/package.scala
rename to modules/lobby/src/main/package.scala
diff --git a/memo/src/main/Builder.scala b/modules/memo/src/main/Builder.scala
similarity index 100%
rename from memo/src/main/Builder.scala
rename to modules/memo/src/main/Builder.scala
diff --git a/memo/src/main/ExpireSetMemo.scala b/modules/memo/src/main/ExpireSetMemo.scala
similarity index 100%
rename from memo/src/main/ExpireSetMemo.scala
rename to modules/memo/src/main/ExpireSetMemo.scala
diff --git a/memo/src/main/package.scala b/modules/memo/src/main/package.scala
similarity index 100%
rename from memo/src/main/package.scala
rename to modules/memo/src/main/package.scala
diff --git a/message/src/main/Api.scala b/modules/message/src/main/Api.scala
similarity index 100%
rename from message/src/main/Api.scala
rename to modules/message/src/main/Api.scala
diff --git a/message/src/main/Cli.scala b/modules/message/src/main/Cli.scala
similarity index 100%
rename from message/src/main/Cli.scala
rename to modules/message/src/main/Cli.scala
diff --git a/message/src/main/DataForm.scala b/modules/message/src/main/DataForm.scala
similarity index 100%
rename from message/src/main/DataForm.scala
rename to modules/message/src/main/DataForm.scala
diff --git a/message/src/main/Env.scala b/modules/message/src/main/Env.scala
similarity index 100%
rename from message/src/main/Env.scala
rename to modules/message/src/main/Env.scala
diff --git a/message/src/main/Post.scala b/modules/message/src/main/Post.scala
similarity index 100%
rename from message/src/main/Post.scala
rename to modules/message/src/main/Post.scala
diff --git a/message/src/main/Thread.scala b/modules/message/src/main/Thread.scala
similarity index 100%
rename from message/src/main/Thread.scala
rename to modules/message/src/main/Thread.scala
diff --git a/message/src/main/ThreadRepo.scala b/modules/message/src/main/ThreadRepo.scala
similarity index 100%
rename from message/src/main/ThreadRepo.scala
rename to modules/message/src/main/ThreadRepo.scala
diff --git a/message/src/main/UnreadCache.scala b/modules/message/src/main/UnreadCache.scala
similarity index 100%
rename from message/src/main/UnreadCache.scala
rename to modules/message/src/main/UnreadCache.scala
diff --git a/message/src/main/package.scala b/modules/message/src/main/package.scala
similarity index 100%
rename from message/src/main/package.scala
rename to modules/message/src/main/package.scala
diff --git a/mod/src/main/Env.scala b/modules/mod/src/main/Env.scala
similarity index 100%
rename from mod/src/main/Env.scala
rename to modules/mod/src/main/Env.scala
diff --git a/mod/src/main/ModApi.scala b/modules/mod/src/main/ModApi.scala
similarity index 100%
rename from mod/src/main/ModApi.scala
rename to modules/mod/src/main/ModApi.scala
diff --git a/mod/src/main/Modlog.scala b/modules/mod/src/main/Modlog.scala
similarity index 100%
rename from mod/src/main/Modlog.scala
rename to modules/mod/src/main/Modlog.scala
diff --git a/mod/src/main/ModlogApi.scala b/modules/mod/src/main/ModlogApi.scala
similarity index 100%
rename from mod/src/main/ModlogApi.scala
rename to modules/mod/src/main/ModlogApi.scala
diff --git a/mod/src/main/package.scala b/modules/mod/src/main/package.scala
similarity index 100%
rename from mod/src/main/package.scala
rename to modules/mod/src/main/package.scala
diff --git a/monitor/src/main/CPU.java b/modules/monitor/src/main/CPU.java
similarity index 100%
rename from monitor/src/main/CPU.java
rename to modules/monitor/src/main/CPU.java
diff --git a/monitor/src/main/Env.scala b/modules/monitor/src/main/Env.scala
similarity index 100%
rename from monitor/src/main/Env.scala
rename to modules/monitor/src/main/Env.scala
diff --git a/monitor/src/main/MongoStatus.scala b/modules/monitor/src/main/MongoStatus.scala
similarity index 100%
rename from monitor/src/main/MongoStatus.scala
rename to modules/monitor/src/main/MongoStatus.scala
diff --git a/monitor/src/main/Reporting.scala b/modules/monitor/src/main/Reporting.scala
similarity index 100%
rename from monitor/src/main/Reporting.scala
rename to modules/monitor/src/main/Reporting.scala
diff --git a/monitor/src/main/RpsProvider.scala b/modules/monitor/src/main/RpsProvider.scala
similarity index 100%
rename from monitor/src/main/RpsProvider.scala
rename to modules/monitor/src/main/RpsProvider.scala
diff --git a/monitor/src/main/Socket.scala b/modules/monitor/src/main/Socket.scala
similarity index 100%
rename from monitor/src/main/Socket.scala
rename to modules/monitor/src/main/Socket.scala
diff --git a/monitor/src/main/SocketHandler.scala b/modules/monitor/src/main/SocketHandler.scala
similarity index 100%
rename from monitor/src/main/SocketHandler.scala
rename to modules/monitor/src/main/SocketHandler.scala
diff --git a/monitor/src/main/actorApi.scala b/modules/monitor/src/main/actorApi.scala
similarity index 100%
rename from monitor/src/main/actorApi.scala
rename to modules/monitor/src/main/actorApi.scala
diff --git a/monitor/src/main/package.scala b/modules/monitor/src/main/package.scala
similarity index 100%
rename from monitor/src/main/package.scala
rename to modules/monitor/src/main/package.scala
diff --git a/notification/src/main/Api.scala b/modules/notification/src/main/Api.scala
similarity index 100%
rename from notification/src/main/Api.scala
rename to modules/notification/src/main/Api.scala
diff --git a/notification/src/main/Env.scala b/modules/notification/src/main/Env.scala
similarity index 100%
rename from notification/src/main/Env.scala
rename to modules/notification/src/main/Env.scala
diff --git a/notification/src/main/Notification.scala b/modules/notification/src/main/Notification.scala
similarity index 100%
rename from notification/src/main/Notification.scala
rename to modules/notification/src/main/Notification.scala
diff --git a/notification/src/main/package.scala b/modules/notification/src/main/package.scala
similarity index 100%
rename from notification/src/main/package.scala
rename to modules/notification/src/main/package.scala
diff --git a/round/src/main/Env.scala b/modules/round/src/main/Env.scala
similarity index 100%
rename from round/src/main/Env.scala
rename to modules/round/src/main/Env.scala
diff --git a/round/src/main/Finisher.scala b/modules/round/src/main/Finisher.scala
similarity index 100%
rename from round/src/main/Finisher.scala
rename to modules/round/src/main/Finisher.scala
diff --git a/round/src/main/FinisherLock.scala b/modules/round/src/main/FinisherLock.scala
similarity index 100%
rename from round/src/main/FinisherLock.scala
rename to modules/round/src/main/FinisherLock.scala
diff --git a/round/src/main/Hand.scala b/modules/round/src/main/Hand.scala
similarity index 100%
rename from round/src/main/Hand.scala
rename to modules/round/src/main/Hand.scala
diff --git a/round/src/main/Hijack.scala b/modules/round/src/main/Hijack.scala
similarity index 100%
rename from round/src/main/Hijack.scala
rename to modules/round/src/main/Hijack.scala
diff --git a/round/src/main/History.scala b/modules/round/src/main/History.scala
similarity index 100%
rename from round/src/main/History.scala
rename to modules/round/src/main/History.scala
diff --git a/round/src/main/Meddler.scala b/modules/round/src/main/Meddler.scala
similarity index 100%
rename from round/src/main/Meddler.scala
rename to modules/round/src/main/Meddler.scala
diff --git a/round/src/main/Messenger.scala b/modules/round/src/main/Messenger.scala
similarity index 100%
rename from round/src/main/Messenger.scala
rename to modules/round/src/main/Messenger.scala
diff --git a/round/src/main/MoveNotifier.scala b/modules/round/src/main/MoveNotifier.scala
similarity index 100%
rename from round/src/main/MoveNotifier.scala
rename to modules/round/src/main/MoveNotifier.scala
diff --git a/round/src/main/Room.scala b/modules/round/src/main/Room.scala
similarity index 100%
rename from round/src/main/Room.scala
rename to modules/round/src/main/Room.scala
diff --git a/round/src/main/RoomRepo.scala b/modules/round/src/main/RoomRepo.scala
similarity index 100%
rename from round/src/main/RoomRepo.scala
rename to modules/round/src/main/RoomRepo.scala
diff --git a/round/src/main/Socket.scala b/modules/round/src/main/Socket.scala
similarity index 100%
rename from round/src/main/Socket.scala
rename to modules/round/src/main/Socket.scala
diff --git a/round/src/main/SocketHandler.scala b/modules/round/src/main/SocketHandler.scala
similarity index 100%
rename from round/src/main/SocketHandler.scala
rename to modules/round/src/main/SocketHandler.scala
diff --git a/round/src/main/SocketHub.scala b/modules/round/src/main/SocketHub.scala
similarity index 100%
rename from round/src/main/SocketHub.scala
rename to modules/round/src/main/SocketHub.scala
diff --git a/round/src/main/Takeback.scala b/modules/round/src/main/Takeback.scala
similarity index 100%
rename from round/src/main/Takeback.scala
rename to modules/round/src/main/Takeback.scala
diff --git a/round/src/main/VersionedEvent.scala b/modules/round/src/main/VersionedEvent.scala
similarity index 100%
rename from round/src/main/VersionedEvent.scala
rename to modules/round/src/main/VersionedEvent.scala
diff --git a/round/src/main/WatcherRoom.scala b/modules/round/src/main/WatcherRoom.scala
similarity index 100%
rename from round/src/main/WatcherRoom.scala
rename to modules/round/src/main/WatcherRoom.scala
diff --git a/round/src/main/WatcherRoomRepo.scala b/modules/round/src/main/WatcherRoomRepo.scala
similarity index 100%
rename from round/src/main/WatcherRoomRepo.scala
rename to modules/round/src/main/WatcherRoomRepo.scala
diff --git a/round/src/main/actorApi.scala b/modules/round/src/main/actorApi.scala
similarity index 100%
rename from round/src/main/actorApi.scala
rename to modules/round/src/main/actorApi.scala
diff --git a/round/src/main/package.scala b/modules/round/src/main/package.scala
similarity index 100%
rename from round/src/main/package.scala
rename to modules/round/src/main/package.scala
diff --git a/search/src/main/ElasticSearch.scala b/modules/search/src/main/ElasticSearch.scala
similarity index 100%
rename from search/src/main/ElasticSearch.scala
rename to modules/search/src/main/ElasticSearch.scala
diff --git a/search/src/main/Env.scala b/modules/search/src/main/Env.scala
similarity index 100%
rename from search/src/main/Env.scala
rename to modules/search/src/main/Env.scala
diff --git a/search/src/main/PaginatorBuilder.scala b/modules/search/src/main/PaginatorBuilder.scala
similarity index 100%
rename from search/src/main/PaginatorBuilder.scala
rename to modules/search/src/main/PaginatorBuilder.scala
diff --git a/search/src/main/Query.scala b/modules/search/src/main/Query.scala
similarity index 100%
rename from search/src/main/Query.scala
rename to modules/search/src/main/Query.scala
diff --git a/search/src/main/Range.scala b/modules/search/src/main/Range.scala
similarity index 100%
rename from search/src/main/Range.scala
rename to modules/search/src/main/Range.scala
diff --git a/search/src/main/TypeIndexer.scala b/modules/search/src/main/TypeIndexer.scala
similarity index 100%
rename from search/src/main/TypeIndexer.scala
rename to modules/search/src/main/TypeIndexer.scala
diff --git a/search/src/main/actorApi.scala b/modules/search/src/main/actorApi.scala
similarity index 100%
rename from search/src/main/actorApi.scala
rename to modules/search/src/main/actorApi.scala
diff --git a/search/src/main/package.scala b/modules/search/src/main/package.scala
similarity index 100%
rename from search/src/main/package.scala
rename to modules/search/src/main/package.scala
diff --git a/security/src/main/Api.scala b/modules/security/src/main/Api.scala
similarity index 100%
rename from security/src/main/Api.scala
rename to modules/security/src/main/Api.scala
diff --git a/security/src/main/Cli.scala b/modules/security/src/main/Cli.scala
similarity index 100%
rename from security/src/main/Cli.scala
rename to modules/security/src/main/Cli.scala
diff --git a/security/src/main/DataForm.scala b/modules/security/src/main/DataForm.scala
similarity index 100%
rename from security/src/main/DataForm.scala
rename to modules/security/src/main/DataForm.scala
diff --git a/security/src/main/Env.scala b/modules/security/src/main/Env.scala
similarity index 100%
rename from security/src/main/Env.scala
rename to modules/security/src/main/Env.scala
diff --git a/security/src/main/Firewall.scala b/modules/security/src/main/Firewall.scala
similarity index 100%
rename from security/src/main/Firewall.scala
rename to modules/security/src/main/Firewall.scala
diff --git a/security/src/main/Flood.scala b/modules/security/src/main/Flood.scala
similarity index 100%
rename from security/src/main/Flood.scala
rename to modules/security/src/main/Flood.scala
diff --git a/security/src/main/Granter.scala b/modules/security/src/main/Granter.scala
similarity index 100%
rename from security/src/main/Granter.scala
rename to modules/security/src/main/Granter.scala
diff --git a/security/src/main/Permission.scala b/modules/security/src/main/Permission.scala
similarity index 100%
rename from security/src/main/Permission.scala
rename to modules/security/src/main/Permission.scala
diff --git a/security/src/main/SecurityHelper.scala b/modules/security/src/main/SecurityHelper.scala
similarity index 100%
rename from security/src/main/SecurityHelper.scala
rename to modules/security/src/main/SecurityHelper.scala
diff --git a/security/src/main/Store.scala b/modules/security/src/main/Store.scala
similarity index 100%
rename from security/src/main/Store.scala
rename to modules/security/src/main/Store.scala
diff --git a/security/src/main/Wiretap.scala b/modules/security/src/main/Wiretap.scala
similarity index 100%
rename from security/src/main/Wiretap.scala
rename to modules/security/src/main/Wiretap.scala
diff --git a/security/src/main/package.scala b/modules/security/src/main/package.scala
similarity index 100%
rename from security/src/main/package.scala
rename to modules/security/src/main/package.scala
diff --git a/setup/src/main/AiConfig.scala b/modules/setup/src/main/AiConfig.scala
similarity index 100%
rename from setup/src/main/AiConfig.scala
rename to modules/setup/src/main/AiConfig.scala
diff --git a/setup/src/main/AnonConfigRepo.scala b/modules/setup/src/main/AnonConfigRepo.scala
similarity index 100%
rename from setup/src/main/AnonConfigRepo.scala
rename to modules/setup/src/main/AnonConfigRepo.scala
diff --git a/setup/src/main/ApiConfig.scala b/modules/setup/src/main/ApiConfig.scala
similarity index 100%
rename from setup/src/main/ApiConfig.scala
rename to modules/setup/src/main/ApiConfig.scala
diff --git a/setup/src/main/Config.scala b/modules/setup/src/main/Config.scala
similarity index 100%
rename from setup/src/main/Config.scala
rename to modules/setup/src/main/Config.scala
diff --git a/setup/src/main/Env.scala b/modules/setup/src/main/Env.scala
similarity index 100%
rename from setup/src/main/Env.scala
rename to modules/setup/src/main/Env.scala
diff --git a/setup/src/main/FilterConfig.scala b/modules/setup/src/main/FilterConfig.scala
similarity index 100%
rename from setup/src/main/FilterConfig.scala
rename to modules/setup/src/main/FilterConfig.scala
diff --git a/setup/src/main/FormFactory.scala b/modules/setup/src/main/FormFactory.scala
similarity index 100%
rename from setup/src/main/FormFactory.scala
rename to modules/setup/src/main/FormFactory.scala
diff --git a/setup/src/main/FriendConfig.scala b/modules/setup/src/main/FriendConfig.scala
similarity index 100%
rename from setup/src/main/FriendConfig.scala
rename to modules/setup/src/main/FriendConfig.scala
diff --git a/setup/src/main/FriendConfigMemo.scala b/modules/setup/src/main/FriendConfigMemo.scala
similarity index 100%
rename from setup/src/main/FriendConfigMemo.scala
rename to modules/setup/src/main/FriendConfigMemo.scala
diff --git a/setup/src/main/FriendJoiner.scala b/modules/setup/src/main/FriendJoiner.scala
similarity index 100%
rename from setup/src/main/FriendJoiner.scala
rename to modules/setup/src/main/FriendJoiner.scala
diff --git a/setup/src/main/HookConfig.scala b/modules/setup/src/main/HookConfig.scala
similarity index 100%
rename from setup/src/main/HookConfig.scala
rename to modules/setup/src/main/HookConfig.scala
diff --git a/setup/src/main/HookJoiner.scala b/modules/setup/src/main/HookJoiner.scala
similarity index 100%
rename from setup/src/main/HookJoiner.scala
rename to modules/setup/src/main/HookJoiner.scala
diff --git a/setup/src/main/HumanConfig.scala b/modules/setup/src/main/HumanConfig.scala
similarity index 100%
rename from setup/src/main/HumanConfig.scala
rename to modules/setup/src/main/HumanConfig.scala
diff --git a/setup/src/main/Mappings.scala b/modules/setup/src/main/Mappings.scala
similarity index 100%
rename from setup/src/main/Mappings.scala
rename to modules/setup/src/main/Mappings.scala
diff --git a/setup/src/main/Processor.scala b/modules/setup/src/main/Processor.scala
similarity index 100%
rename from setup/src/main/Processor.scala
rename to modules/setup/src/main/Processor.scala
diff --git a/setup/src/main/Rematcher.scala b/modules/setup/src/main/Rematcher.scala
similarity index 100%
rename from setup/src/main/Rematcher.scala
rename to modules/setup/src/main/Rematcher.scala
diff --git a/setup/src/main/UserConfig.scala b/modules/setup/src/main/UserConfig.scala
similarity index 100%
rename from setup/src/main/UserConfig.scala
rename to modules/setup/src/main/UserConfig.scala
diff --git a/setup/src/main/UserConfigRepo.scala b/modules/setup/src/main/UserConfigRepo.scala
similarity index 100%
rename from setup/src/main/UserConfigRepo.scala
rename to modules/setup/src/main/UserConfigRepo.scala
diff --git a/setup/src/main/package.scala b/modules/setup/src/main/package.scala
similarity index 100%
rename from setup/src/main/package.scala
rename to modules/setup/src/main/package.scala
diff --git a/site/src/main/Env.scala b/modules/site/src/main/Env.scala
similarity index 100%
rename from site/src/main/Env.scala
rename to modules/site/src/main/Env.scala
diff --git a/site/src/main/Socket.scala b/modules/site/src/main/Socket.scala
similarity index 100%
rename from site/src/main/Socket.scala
rename to modules/site/src/main/Socket.scala
diff --git a/site/src/main/SocketHandler.scala b/modules/site/src/main/SocketHandler.scala
similarity index 100%
rename from site/src/main/SocketHandler.scala
rename to modules/site/src/main/SocketHandler.scala
diff --git a/site/src/main/actorApi.scala b/modules/site/src/main/actorApi.scala
similarity index 100%
rename from site/src/main/actorApi.scala
rename to modules/site/src/main/actorApi.scala
diff --git a/site/src/main/package.scala b/modules/site/src/main/package.scala
similarity index 100%
rename from site/src/main/package.scala
rename to modules/site/src/main/package.scala
diff --git a/socket/src/main/Env.scala b/modules/socket/src/main/Env.scala
similarity index 100%
rename from socket/src/main/Env.scala
rename to modules/socket/src/main/Env.scala
diff --git a/socket/src/main/Handler.scala b/modules/socket/src/main/Handler.scala
similarity index 100%
rename from socket/src/main/Handler.scala
rename to modules/socket/src/main/Handler.scala
diff --git a/socket/src/main/Historical.scala b/modules/socket/src/main/Historical.scala
similarity index 100%
rename from socket/src/main/Historical.scala
rename to modules/socket/src/main/Historical.scala
diff --git a/socket/src/main/History.scala b/modules/socket/src/main/History.scala
similarity index 100%
rename from socket/src/main/History.scala
rename to modules/socket/src/main/History.scala
diff --git a/socket/src/main/SocketActor.scala b/modules/socket/src/main/SocketActor.scala
similarity index 100%
rename from socket/src/main/SocketActor.scala
rename to modules/socket/src/main/SocketActor.scala
diff --git a/socket/src/main/SocketMember.scala b/modules/socket/src/main/SocketMember.scala
similarity index 100%
rename from socket/src/main/SocketMember.scala
rename to modules/socket/src/main/SocketMember.scala
diff --git a/socket/src/main/WithSocket.scala b/modules/socket/src/main/WithSocket.scala
similarity index 100%
rename from socket/src/main/WithSocket.scala
rename to modules/socket/src/main/WithSocket.scala
diff --git a/socket/src/main/actorApi.scala b/modules/socket/src/main/actorApi.scala
similarity index 100%
rename from socket/src/main/actorApi.scala
rename to modules/socket/src/main/actorApi.scala
diff --git a/socket/src/main/package.scala b/modules/socket/src/main/package.scala
similarity index 100%
rename from socket/src/main/package.scala
rename to modules/socket/src/main/package.scala
diff --git a/team/src/main/Cached.scala b/modules/team/src/main/Cached.scala
similarity index 100%
rename from team/src/main/Cached.scala
rename to modules/team/src/main/Cached.scala
diff --git a/team/src/main/DataForm.scala b/modules/team/src/main/DataForm.scala
similarity index 100%
rename from team/src/main/DataForm.scala
rename to modules/team/src/main/DataForm.scala
diff --git a/team/src/main/Env.scala b/modules/team/src/main/Env.scala
similarity index 100%
rename from team/src/main/Env.scala
rename to modules/team/src/main/Env.scala
diff --git a/team/src/main/Member.scala b/modules/team/src/main/Member.scala
similarity index 100%
rename from team/src/main/Member.scala
rename to modules/team/src/main/Member.scala
diff --git a/team/src/main/MemberRepo.scala b/modules/team/src/main/MemberRepo.scala
similarity index 100%
rename from team/src/main/MemberRepo.scala
rename to modules/team/src/main/MemberRepo.scala
diff --git a/team/src/main/Notifier.scala b/modules/team/src/main/Notifier.scala
similarity index 100%
rename from team/src/main/Notifier.scala
rename to modules/team/src/main/Notifier.scala
diff --git a/team/src/main/PaginatorBuilder.scala b/modules/team/src/main/PaginatorBuilder.scala
similarity index 100%
rename from team/src/main/PaginatorBuilder.scala
rename to modules/team/src/main/PaginatorBuilder.scala
diff --git a/team/src/main/Request.scala b/modules/team/src/main/Request.scala
similarity index 100%
rename from team/src/main/Request.scala
rename to modules/team/src/main/Request.scala
diff --git a/team/src/main/RequestRepo.scala b/modules/team/src/main/RequestRepo.scala
similarity index 100%
rename from team/src/main/RequestRepo.scala
rename to modules/team/src/main/RequestRepo.scala
diff --git a/team/src/main/Team.scala b/modules/team/src/main/Team.scala
similarity index 100%
rename from team/src/main/Team.scala
rename to modules/team/src/main/Team.scala
diff --git a/team/src/main/TeamApi.scala b/modules/team/src/main/TeamApi.scala
similarity index 100%
rename from team/src/main/TeamApi.scala
rename to modules/team/src/main/TeamApi.scala
diff --git a/team/src/main/TeamRepo.scala b/modules/team/src/main/TeamRepo.scala
similarity index 100%
rename from team/src/main/TeamRepo.scala
rename to modules/team/src/main/TeamRepo.scala
diff --git a/team/src/main/actorApi.scala b/modules/team/src/main/actorApi.scala
similarity index 100%
rename from team/src/main/actorApi.scala
rename to modules/team/src/main/actorApi.scala
diff --git a/team/src/main/package.scala b/modules/team/src/main/package.scala
similarity index 100%
rename from team/src/main/package.scala
rename to modules/team/src/main/package.scala
diff --git a/teamSearch/src/main/Env.scala b/modules/teamSearch/src/main/Env.scala
similarity index 100%
rename from teamSearch/src/main/Env.scala
rename to modules/teamSearch/src/main/Env.scala
diff --git a/teamSearch/src/main/Indexer.scala b/modules/teamSearch/src/main/Indexer.scala
similarity index 100%
rename from teamSearch/src/main/Indexer.scala
rename to modules/teamSearch/src/main/Indexer.scala
diff --git a/teamSearch/src/main/Query.scala b/modules/teamSearch/src/main/Query.scala
similarity index 100%
rename from teamSearch/src/main/Query.scala
rename to modules/teamSearch/src/main/Query.scala
diff --git a/teamSearch/src/main/Team.scala b/modules/teamSearch/src/main/Team.scala
similarity index 100%
rename from teamSearch/src/main/Team.scala
rename to modules/teamSearch/src/main/Team.scala
diff --git a/teamSearch/src/main/package.scala b/modules/teamSearch/src/main/package.scala
similarity index 100%
rename from teamSearch/src/main/package.scala
rename to modules/teamSearch/src/main/package.scala
diff --git a/timeline/src/main/Entry.scala b/modules/timeline/src/main/Entry.scala
similarity index 100%
rename from timeline/src/main/Entry.scala
rename to modules/timeline/src/main/Entry.scala
diff --git a/timeline/src/main/Env.scala b/modules/timeline/src/main/Env.scala
similarity index 100%
rename from timeline/src/main/Env.scala
rename to modules/timeline/src/main/Env.scala
diff --git a/timeline/src/main/Push.scala b/modules/timeline/src/main/Push.scala
similarity index 100%
rename from timeline/src/main/Push.scala
rename to modules/timeline/src/main/Push.scala
diff --git a/timeline/src/main/package.scala b/modules/timeline/src/main/package.scala
similarity index 100%
rename from timeline/src/main/package.scala
rename to modules/timeline/src/main/package.scala
diff --git a/user/src/main/Cached.scala b/modules/user/src/main/Cached.scala
similarity index 100%
rename from user/src/main/Cached.scala
rename to modules/user/src/main/Cached.scala
diff --git a/user/src/main/Context.scala b/modules/user/src/main/Context.scala
similarity index 100%
rename from user/src/main/Context.scala
rename to modules/user/src/main/Context.scala
diff --git a/user/src/main/DataForm.scala b/modules/user/src/main/DataForm.scala
similarity index 100%
rename from user/src/main/DataForm.scala
rename to modules/user/src/main/DataForm.scala
diff --git a/user/src/main/EloChart.scala b/modules/user/src/main/EloChart.scala
similarity index 100%
rename from user/src/main/EloChart.scala
rename to modules/user/src/main/EloChart.scala
diff --git a/user/src/main/EloUpdater.scala b/modules/user/src/main/EloUpdater.scala
similarity index 100%
rename from user/src/main/EloUpdater.scala
rename to modules/user/src/main/EloUpdater.scala
diff --git a/user/src/main/Env.scala b/modules/user/src/main/Env.scala
similarity index 100%
rename from user/src/main/Env.scala
rename to modules/user/src/main/Env.scala
diff --git a/user/src/main/HistoryRepo.scala b/modules/user/src/main/HistoryRepo.scala
similarity index 100%
rename from user/src/main/HistoryRepo.scala
rename to modules/user/src/main/HistoryRepo.scala
diff --git a/user/src/main/PaginatorBuilder.scala b/modules/user/src/main/PaginatorBuilder.scala
similarity index 100%
rename from user/src/main/PaginatorBuilder.scala
rename to modules/user/src/main/PaginatorBuilder.scala
diff --git a/user/src/main/Room.scala b/modules/user/src/main/Room.scala
similarity index 100%
rename from user/src/main/Room.scala
rename to modules/user/src/main/Room.scala
diff --git a/user/src/main/Setting.scala b/modules/user/src/main/Setting.scala
similarity index 100%
rename from user/src/main/Setting.scala
rename to modules/user/src/main/Setting.scala
diff --git a/user/src/main/Theme.scala b/modules/user/src/main/Theme.scala
similarity index 100%
rename from user/src/main/Theme.scala
rename to modules/user/src/main/Theme.scala
diff --git a/user/src/main/User.scala b/modules/user/src/main/User.scala
similarity index 100%
rename from user/src/main/User.scala
rename to modules/user/src/main/User.scala
diff --git a/user/src/main/UserRepo.scala b/modules/user/src/main/UserRepo.scala
similarity index 100%
rename from user/src/main/UserRepo.scala
rename to modules/user/src/main/UserRepo.scala
diff --git a/user/src/main/UsernameMemo.scala b/modules/user/src/main/UsernameMemo.scala
similarity index 100%
rename from user/src/main/UsernameMemo.scala
rename to modules/user/src/main/UsernameMemo.scala
diff --git a/user/src/main/package.scala b/modules/user/src/main/package.scala
similarity index 100%
rename from user/src/main/package.scala
rename to modules/user/src/main/package.scala
diff --git a/user/src/test/RepoTest.scala b/modules/user/src/test/RepoTest.scala
similarity index 100%
rename from user/src/test/RepoTest.scala
rename to modules/user/src/test/RepoTest.scala
diff --git a/wiki/src/main/Api.scala b/modules/wiki/src/main/Api.scala
similarity index 100%
rename from wiki/src/main/Api.scala
rename to modules/wiki/src/main/Api.scala
diff --git a/wiki/src/main/Env.scala b/modules/wiki/src/main/Env.scala
similarity index 100%
rename from wiki/src/main/Env.scala
rename to modules/wiki/src/main/Env.scala
diff --git a/wiki/src/main/Fetch.scala b/modules/wiki/src/main/Fetch.scala
similarity index 100%
rename from wiki/src/main/Fetch.scala
rename to modules/wiki/src/main/Fetch.scala
diff --git a/wiki/src/main/Page.scala b/modules/wiki/src/main/Page.scala
similarity index 100%
rename from wiki/src/main/Page.scala
rename to modules/wiki/src/main/Page.scala
diff --git a/wiki/src/main/package.scala b/modules/wiki/src/main/package.scala
similarity index 100%
rename from wiki/src/main/package.scala
rename to modules/wiki/src/main/package.scala
diff --git a/project/Build.scala b/project/Build.scala
index 1291ad81fc..0fb82cabe9 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -186,7 +186,7 @@ object ApplicationBuild extends Build {
     libraryDependencies ++= provided(playApi)
   )
 
-  lazy val chess = project("scalachess").settings(
+  lazy val chess = project("chess").settings(
     libraryDependencies ++= Seq(hasher)
   )
 }
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 3fab7ea0b8..44def6f921 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -28,7 +28,7 @@ object BuildSettings {
   def project(name: String, deps: Seq[sbt.ClasspathDep[sbt.ProjectReference]] = Seq.empty) =
     Project(
       name,
-      file(name),
+      file("modules/" + name),
       dependencies = deps,
       settings = Seq(
         version := "1.0",