split core and ogc code