Redid commands, main and storage classes.