moving classes to more appropriate packages