Adding subdirectory support.