Refreshed classes and structure.