Rearranged a bunch of stuff so setup.py doesn't take a shit on your system