Fix packaging by using explicit subdir for module

It's kind of sad that we have to follow this convention, but in the end
it's easier to just use an explicit subdir for the module. Packaging in
python fundamentally sucks. :(
More files that should have been committed before

This is part of the previous commit.