Revert "Check/Search directories for subdirectories"

This reverts commit 8f8138e980a73cade89a1754c80d084dab72d6f8.