This reverts commit 7c41cbabe7. Not doing this now.
7c41cbabe7
Also, move User, PackedUser, Group, PackedGroup to better-fit places.
Also move DB and Corpus to their own files while doing that.