Fix for putting files in subdirectory