change class file names to match msc/hid
move files to match acros class