Renamed and moved some packages because they bothered me