Much reorganization of project structure