cleaned project structure