Total renaming / restructurating classes.