move package and classes around
move package and classes around