Correct Subdir Handling