Rework project structure