Moved controllers to individual files for clarity. Reduced namespacing.