Improve on dependencies of dictionaries across subdirectories