This commit fixes up the initial import, correcting import paths, moving some code into a "private" module, updating requirements files, etc.