Initial cleanup of entities we moved to vespolina/core and vespolina/order