Clean up subdir and dependency logic
1 file changed