[1603] core switch to EMF, class cleanup and start of bean wrapper