Fixed Project structure so that it can be setup and tested easier