Issue #2274815 by eshta: simplify information architecture.