Clean up project structure