rename packages and classes to make more sense