Further re-org: only Core, Network, Roster and Users remain at top level