[JBIDE 15496] 1st step separation UI/Core