Convert tests to work with new directory tree
Change commandline script name and upload to PyPi