OK: controller refactored, scripts reordered/moved, introduced partials