Re-factoring of View classes. Removal of old, unused classes.