rearrange things to prep for setup.py creation