package the python project appropriately
more refactoring