Reworked controllers including some rest containers and fixed #8.