Moving some classes to more appropriate packages