more reorganization on a platform level