Split controls to separate class