relayout project structure