Merge "Revert "Revert "Move runtime/ to ClassAccessor"""