Closing in on a sensible organization scheme, I think