Starting to get files working under the new scheme.