Moved classes to more representable packages