Refactoring of project layout