A lot of refactoring of the parsing and uploading packages. Tests
refactored to clean up after themselves (ongoing)