Update to put files in subdirs