more renaming/moving classes and packages for sheer delight