Rename files to act as proper containers.