some class renamed

and intial set up for ch3