re arrange and deleted unneeded classes