Moved files around and get setup.py working
Remove