Adding support for subdirectories in results.
Fix pep8