MAJOR refactoring of the project layout