Refactored with Application.cfc, cfcomponents and updated includes