Proposed reorganization and themes distribution