removed unnecessary controller files and consolidated datasource and delegate to one file