Removed some inner classes to single classes.