moving classes to the right package