Continuing to extract / renaming inner classes