Inverted Dependency UIEngine to CoreEngine
Resolving conflicts