[WIP] Refactor controllers

the same