Filename cleanup, less files merges, naming conventions
Missed a controller rename