Change packages structure. Rename some classes. by okAndrew