moving to a single package so that i can hide things better