Adding IControler, remove old unused class