Cleaned up the project structure