Restructuring

Making sure sbt correctly compiles for everyone by respecting the architecture
Merge branch 'master' of https://github.com/aghosn/testingWebsocket