moved and removed some classes and packages