Minor adjustment to folder structure.