Put controllers in separate files by feature, other misc cleanup.