reorganising the projects.. simplifying things
simplifying
more refactoring