Break up controller code, change app namespace