Added controller classes and renamed old files