reorganize/rename class entries