convert expandable layer groups to be class based
[testing commit]