[FIX] ability to handle subdirs