Restructured classes. Preparing for some changes.