Initial refactoring of view and resource organization.