Controller structure fix

Fixing complete