And while at it, move it to separate subpackages, following Fedora packaging guidelines.
This is partly because qubes/__init__.py conflicted with core3. It is also a good practice.