Changing project structure to be contained in modules, cpp and header in the same folder