Simplify, make Entity an abstract merge support and drop intf
update Asset and Component stubs to be concrete