[WIP] Refactor controllers

PHPdoc is missing