Refactor project structure and folders