Files are now in subdirectories

Previously files ignored custom filename definition that included a path. Now additional paths are being respected