Move models around for possible move to differernt tree implementation

Looks like django-mptt isn't ever going to have a tree_id that can be manually
set. It's not quite clear whether that's just an implementation detail or
there's some reason to keep tree_id consecutive. My gut feeling is that this
doesn't need to be so.