moving some classes in correct packages