Refactor the project dir layout