Looking to fix the subdir issues