Major refactoring AGAIN! Split CoreApi to Core+Api