Started extracting empty classes.