Move to a class oriented structure.