Think I finally correcte the subdirectory issue