[WIP] Refactor controllers

IMHO I will remove this PHPStorm notation