Modified directory structure to hopefully work with setup.py