Controllers were refactored

Signed-off-by: yury.kaliada <fut.wrk@gmail.com>