solution clean
rename, added some classes