Moved stuff around so it can install with setup.py