Changing controllers for now structure