Updated to work from the current config and python directory structure.