Moving classes and renaming them to better fit their purpose.