Relayout project structure