Now adding renamed files to match new class names