made a few more packages and rearranged stuff