The organization I'm moving towards, is to have the core software be just that, the modules be optional parts of the software included with the software that can be enabled or disabled freely without things fucking up, and the plugins being third-party stuff entirely in its own repo we don't officially support directly.

A lot of stuff in modules will probably be merged into the core software under this philosophy.  Likewise, I'd like to get many non-essential core features sliced into modules.