reordered project structure