Consolidating some resources into Controller files
Consolidating more resources into controllers