Refactoring project layout