Massive template cleanout and organization. Pt.1