moved around packages to remove public access modifiers from certain classes, imports cleanup