Move all class to good package