rearranges classes, privatizes some methods.