Re #1709 Corelib reorganization