Reorganizing project structure

Needed in order to get it to build in teamcity properly