Re #1709 Corelib reorganization
RE #1709 Fix for Corelib re-organization
Re #1803 fixed insane check
Merge branch 'feat/1709-codecleanup' into develop