restructures packages a bit