[WIP] Refactor controllers

description is missing