moved some classes to the right package