[WIP] Refactor controllers

PHPDoc is missing