[WIP] Refactor controllers

PHPDOC is missing