Refactored code layout.
More layout refactoring.
More refactoring.