re-arranged controllers and files