Renamed and moved some packages

Renamed and moved some packages.