More package moves / cleanup