Refactor DashboardCtrl to correct class and location