shifted everything around to make it play nice with setup.py