Reorganising the View Helpers and Partials to make things more maintainable in the future.