Restructured and renamed classes.