Refactoring project layout.