Re-work project structure.