Renamed "base_folder" into "base_directory"