Cleanup of the project structure