moving classes in the proper package