moved all the code into a single project