moving some stuff around to new packages