CMS-4664 Refactoring - Better structure for portal modules.