refactor layout of project structure