refactor other classes to new localisation format