restructuring packages and classes