Ensure subdirs are properly tracked