Refactored project layout.
More layout refactoring.