Refine structure by moving specific data from the controller
Move Controller to generic location