Organize code into Python package
Fix typo in import statement