rename files
remove completely separate ui class