refactor project's structure