Getting setup.py working, moving folders around