moved some classes to correct packages