substantial directory and file-structure changes