rearranged everything to packages

if you haven't changed your tests by now you will have to now, I assure
you that.