Renamed and moved some packages