Issue #37: Re-organize modules into more useful groupings, remove package from themes.