Directory restructuring, preparation for uploading to PyPi