Made forcing the parent folder to be of the same name optional.