diff --git a/tensorflow_20.08-tf1-py3.sif b/tensorflow_20.08-tf1-py3.sif
new file mode 120000
index 0000000000000000000000000000000000000000..dfe9c84cb501f11eeb46c7ed438b11bd97ff31f3
--- /dev/null
+++ b/tensorflow_20.08-tf1-py3.sif
@@ -0,0 +1 @@
+/p/project/deepacf/deeprain/video_prediction_shared_folder/herten1/tensorflow_20.08-tf1-py3.sif
\ No newline at end of file
diff --git a/video_prediction_savp/Dockerfiles/Dockerfile_base b/video_prediction_tools/Dockerfiles/Dockerfile_base
similarity index 100%
rename from video_prediction_savp/Dockerfiles/Dockerfile_base
rename to video_prediction_tools/Dockerfiles/Dockerfile_base
diff --git a/video_prediction_savp/Dockerfiles/Dockerfile_tf b/video_prediction_tools/Dockerfiles/Dockerfile_tf
similarity index 100%
rename from video_prediction_savp/Dockerfiles/Dockerfile_tf
rename to video_prediction_tools/Dockerfiles/Dockerfile_tf
diff --git a/video_prediction_savp/HPC_scripts/data_extraction_era5_template.sh b/video_prediction_tools/HPC_scripts/data_extraction_era5_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/data_extraction_era5_template.sh
rename to video_prediction_tools/HPC_scripts/data_extraction_era5_template.sh
diff --git a/video_prediction_savp/HPC_scripts/preprocess_data_era5_step1_template.sh b/video_prediction_tools/HPC_scripts/preprocess_data_era5_step1_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/preprocess_data_era5_step1_template.sh
rename to video_prediction_tools/HPC_scripts/preprocess_data_era5_step1_template.sh
diff --git a/video_prediction_savp/HPC_scripts/preprocess_data_era5_step2_template.sh b/video_prediction_tools/HPC_scripts/preprocess_data_era5_step2_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/preprocess_data_era5_step2_template.sh
rename to video_prediction_tools/HPC_scripts/preprocess_data_era5_step2_template.sh
diff --git a/video_prediction_savp/HPC_scripts/preprocess_data_moving_mnist_template.sh b/video_prediction_tools/HPC_scripts/preprocess_data_moving_mnist_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/preprocess_data_moving_mnist_template.sh
rename to video_prediction_tools/HPC_scripts/preprocess_data_moving_mnist_template.sh
diff --git a/video_prediction_savp/HPC_scripts/train_model_era5_template.sh b/video_prediction_tools/HPC_scripts/train_model_era5_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/train_model_era5_template.sh
rename to video_prediction_tools/HPC_scripts/train_model_era5_template.sh
diff --git a/video_prediction_savp/HPC_scripts/train_model_moving_mnist_template.sh b/video_prediction_tools/HPC_scripts/train_model_moving_mnist_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/train_model_moving_mnist_template.sh
rename to video_prediction_tools/HPC_scripts/train_model_moving_mnist_template.sh
diff --git a/video_prediction_savp/HPC_scripts/visualize_postprocess_era5_template.sh b/video_prediction_tools/HPC_scripts/visualize_postprocess_era5_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/visualize_postprocess_era5_template.sh
rename to video_prediction_tools/HPC_scripts/visualize_postprocess_era5_template.sh
diff --git a/video_prediction_savp/HPC_scripts/visualize_postprocess_moving_mnist_template.sh b/video_prediction_tools/HPC_scripts/visualize_postprocess_moving_mnist_template.sh
similarity index 100%
rename from video_prediction_savp/HPC_scripts/visualize_postprocess_moving_mnist_template.sh
rename to video_prediction_tools/HPC_scripts/visualize_postprocess_moving_mnist_template.sh
diff --git a/video_prediction_savp/LICENSE b/video_prediction_tools/LICENSE
similarity index 100%
rename from video_prediction_savp/LICENSE
rename to video_prediction_tools/LICENSE
diff --git a/video_prediction_savp/Zam347_scripts/data_extraction_era5_template.sh b/video_prediction_tools/Zam347_scripts/data_extraction_era5_template.sh
similarity index 100%
rename from video_prediction_savp/Zam347_scripts/data_extraction_era5_template.sh
rename to video_prediction_tools/Zam347_scripts/data_extraction_era5_template.sh
diff --git a/video_prediction_savp/Zam347_scripts/preprocess_data_era5_step1_template.sh b/video_prediction_tools/Zam347_scripts/preprocess_data_era5_step1_template.sh
similarity index 100%
rename from video_prediction_savp/Zam347_scripts/preprocess_data_era5_step1_template.sh
rename to video_prediction_tools/Zam347_scripts/preprocess_data_era5_step1_template.sh
diff --git a/video_prediction_savp/Zam347_scripts/preprocess_data_era5_step2_template.sh b/video_prediction_tools/Zam347_scripts/preprocess_data_era5_step2_template.sh
similarity index 100%
rename from video_prediction_savp/Zam347_scripts/preprocess_data_era5_step2_template.sh
rename to video_prediction_tools/Zam347_scripts/preprocess_data_era5_step2_template.sh
diff --git a/video_prediction_savp/Zam347_scripts/train_model_era5_template.sh b/video_prediction_tools/Zam347_scripts/train_model_era5_template.sh
similarity index 100%
rename from video_prediction_savp/Zam347_scripts/train_model_era5_template.sh
rename to video_prediction_tools/Zam347_scripts/train_model_era5_template.sh
diff --git a/video_prediction_savp/Zam347_scripts/visualize_postprocess_era5_template.sh b/video_prediction_tools/Zam347_scripts/visualize_postprocess_era5_template.sh
similarity index 100%
rename from video_prediction_savp/Zam347_scripts/visualize_postprocess_era5_template.sh
rename to video_prediction_tools/Zam347_scripts/visualize_postprocess_era5_template.sh
diff --git a/video_prediction_savp/deprecate/datasets/era5_dataset_v2_anomaly.py b/video_prediction_tools/deprecate/datasets/era5_dataset_v2_anomaly.py
similarity index 100%
rename from video_prediction_savp/deprecate/datasets/era5_dataset_v2_anomaly.py
rename to video_prediction_tools/deprecate/datasets/era5_dataset_v2_anomaly.py
diff --git a/video_prediction_savp/deprecate/helper/helper.py b/video_prediction_tools/deprecate/helper/helper.py
similarity index 100%
rename from video_prediction_savp/deprecate/helper/helper.py
rename to video_prediction_tools/deprecate/helper/helper.py
diff --git a/video_prediction_savp/deprecate/pretrained_models/download_model.sh b/video_prediction_tools/deprecate/pretrained_models/download_model.sh
similarity index 100%
rename from video_prediction_savp/deprecate/pretrained_models/download_model.sh
rename to video_prediction_tools/deprecate/pretrained_models/download_model.sh
diff --git a/video_prediction_savp/deprecate/scripts/combine_results.py b/video_prediction_tools/deprecate/scripts/combine_results.py
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/combine_results.py
rename to video_prediction_tools/deprecate/scripts/combine_results.py
diff --git a/video_prediction_savp/deprecate/scripts/evaluate.py b/video_prediction_tools/deprecate/scripts/evaluate.py
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/evaluate.py
rename to video_prediction_tools/deprecate/scripts/evaluate.py
diff --git a/video_prediction_savp/deprecate/scripts/evaluate_all.sh b/video_prediction_tools/deprecate/scripts/evaluate_all.sh
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/evaluate_all.sh
rename to video_prediction_tools/deprecate/scripts/evaluate_all.sh
diff --git a/video_prediction_savp/deprecate/scripts/generate_all.sh b/video_prediction_tools/deprecate/scripts/generate_all.sh
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/generate_all.sh
rename to video_prediction_tools/deprecate/scripts/generate_all.sh
diff --git a/video_prediction_savp/deprecate/scripts/generate_orig.py b/video_prediction_tools/deprecate/scripts/generate_orig.py
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/generate_orig.py
rename to video_prediction_tools/deprecate/scripts/generate_orig.py
diff --git a/video_prediction_savp/deprecate/scripts/plot_results.py b/video_prediction_tools/deprecate/scripts/plot_results.py
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/plot_results.py
rename to video_prediction_tools/deprecate/scripts/plot_results.py
diff --git a/video_prediction_savp/deprecate/scripts/plot_results_all.sh b/video_prediction_tools/deprecate/scripts/plot_results_all.sh
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/plot_results_all.sh
rename to video_prediction_tools/deprecate/scripts/plot_results_all.sh
diff --git a/video_prediction_savp/deprecate/scripts/train.py b/video_prediction_tools/deprecate/scripts/train.py
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/train.py
rename to video_prediction_tools/deprecate/scripts/train.py
diff --git a/video_prediction_savp/deprecate/scripts/train_all.sh b/video_prediction_tools/deprecate/scripts/train_all.sh
similarity index 100%
rename from video_prediction_savp/deprecate/scripts/train_all.sh
rename to video_prediction_tools/deprecate/scripts/train_all.sh
diff --git a/video_prediction_savp/docs/discussion/discussion.md b/video_prediction_tools/docs/discussion/discussion.md
similarity index 100%
rename from video_prediction_savp/docs/discussion/discussion.md
rename to video_prediction_tools/docs/discussion/discussion.md
diff --git a/video_prediction_savp/docs/structure_name_convention.md b/video_prediction_tools/docs/structure_name_convention.md
similarity index 100%
rename from video_prediction_savp/docs/structure_name_convention.md
rename to video_prediction_tools/docs/structure_name_convention.md
diff --git a/video_prediction_savp/env_setup/create_env.sh b/video_prediction_tools/env_setup/create_env.sh
similarity index 100%
rename from video_prediction_savp/env_setup/create_env.sh
rename to video_prediction_tools/env_setup/create_env.sh
diff --git a/video_prediction_savp/env_setup/create_env_zam347.sh b/video_prediction_tools/env_setup/create_env_zam347.sh
similarity index 100%
rename from video_prediction_savp/env_setup/create_env_zam347.sh
rename to video_prediction_tools/env_setup/create_env_zam347.sh
diff --git a/video_prediction_savp/env_setup/generate_workflow_runscripts.sh b/video_prediction_tools/env_setup/generate_workflow_runscripts.sh
similarity index 100%
rename from video_prediction_savp/env_setup/generate_workflow_runscripts.sh
rename to video_prediction_tools/env_setup/generate_workflow_runscripts.sh
diff --git a/video_prediction_savp/env_setup/modules_preprocess.sh b/video_prediction_tools/env_setup/modules_preprocess.sh
similarity index 100%
rename from video_prediction_savp/env_setup/modules_preprocess.sh
rename to video_prediction_tools/env_setup/modules_preprocess.sh
diff --git a/video_prediction_savp/env_setup/modules_train.sh b/video_prediction_tools/env_setup/modules_train.sh
similarity index 100%
rename from video_prediction_savp/env_setup/modules_train.sh
rename to video_prediction_tools/env_setup/modules_train.sh
diff --git a/video_prediction_savp/env_setup/requirements.txt b/video_prediction_tools/env_setup/requirements.txt
similarity index 100%
rename from video_prediction_savp/env_setup/requirements.txt
rename to video_prediction_tools/env_setup/requirements.txt
diff --git a/video_prediction_savp/external_package/hickle/bin/f2py b/video_prediction_tools/external_package/hickle/bin/f2py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/bin/f2py
rename to video_prediction_tools/external_package/hickle/bin/f2py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/easy-install.pth b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/easy-install.pth
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/easy-install.pth
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/easy-install.pth
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/PKG-INFO b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/PKG-INFO
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/PKG-INFO
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/PKG-INFO
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/SOURCES.txt b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/SOURCES.txt
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/SOURCES.txt
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/SOURCES.txt
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/dependency_links.txt b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/dependency_links.txt
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/dependency_links.txt
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/dependency_links.txt
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/not-zip-safe b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/not-zip-safe
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/not-zip-safe
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/not-zip-safe
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/requires.txt b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/requires.txt
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/requires.txt
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/requires.txt
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/top_level.txt b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/top_level.txt
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/top_level.txt
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/EGG-INFO/top_level.txt
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/__init__.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/__init__.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/__init__.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/__init__.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/helpers.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/helpers.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/helpers.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/helpers.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy2.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy2.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy2.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/hickle_legacy2.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/__init__.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/__init__.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/__init__.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/__init__.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_astropy.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_astropy.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_astropy.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_astropy.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_numpy.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_numpy.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_numpy.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_numpy.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_pandas.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_pandas.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_pandas.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_pandas.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python3.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python3.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python3.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_python3.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_scipy.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_scipy.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_scipy.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/loaders/load_scipy.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/lookup.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/lookup.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/lookup.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/hickle/lookup.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/__init__.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/__init__.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/__init__.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/__init__.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_astropy.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_astropy.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_astropy.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_astropy.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle_helpers.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle_helpers.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle_helpers.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_hickle_helpers.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_legacy_load.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_legacy_load.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_legacy_load.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_legacy_load.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_scipy.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_scipy.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_scipy.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/hickle-3.4.3-py3.6.egg/tests/test_scipy.py
diff --git a/video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/site.py b/video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/site.py
similarity index 100%
rename from video_prediction_savp/external_package/hickle/lib/python3.6/site-packages/site.py
rename to video_prediction_tools/external_package/hickle/lib/python3.6/site-packages/site.py
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/.gitignore b/video_prediction_tools/external_package/lpips-tensorflow/.gitignore
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/.gitignore
rename to video_prediction_tools/external_package/lpips-tensorflow/.gitignore
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/.gitmodules b/video_prediction_tools/external_package/lpips-tensorflow/.gitmodules
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/.gitmodules
rename to video_prediction_tools/external_package/lpips-tensorflow/.gitmodules
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/LICENSE b/video_prediction_tools/external_package/lpips-tensorflow/LICENSE
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/LICENSE
rename to video_prediction_tools/external_package/lpips-tensorflow/LICENSE
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/README.md b/video_prediction_tools/external_package/lpips-tensorflow/README.md
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/README.md
rename to video_prediction_tools/external_package/lpips-tensorflow/README.md
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/export_to_tensorflow.py b/video_prediction_tools/external_package/lpips-tensorflow/export_to_tensorflow.py
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/export_to_tensorflow.py
rename to video_prediction_tools/external_package/lpips-tensorflow/export_to_tensorflow.py
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/lpips_tf.py b/video_prediction_tools/external_package/lpips-tensorflow/lpips_tf.py
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/lpips_tf.py
rename to video_prediction_tools/external_package/lpips-tensorflow/lpips_tf.py
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/requirements-dev.txt b/video_prediction_tools/external_package/lpips-tensorflow/requirements-dev.txt
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/requirements-dev.txt
rename to video_prediction_tools/external_package/lpips-tensorflow/requirements-dev.txt
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/requirements.txt b/video_prediction_tools/external_package/lpips-tensorflow/requirements.txt
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/requirements.txt
rename to video_prediction_tools/external_package/lpips-tensorflow/requirements.txt
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/setup.py b/video_prediction_tools/external_package/lpips-tensorflow/setup.py
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/setup.py
rename to video_prediction_tools/external_package/lpips-tensorflow/setup.py
diff --git a/video_prediction_savp/external_package/lpips-tensorflow/test_network.py b/video_prediction_tools/external_package/lpips-tensorflow/test_network.py
similarity index 100%
rename from video_prediction_savp/external_package/lpips-tensorflow/test_network.py
rename to video_prediction_tools/external_package/lpips-tensorflow/test_network.py
diff --git a/video_prediction_savp/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json b/video_prediction_tools/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
rename to video_prediction_tools/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
diff --git a/video_prediction_savp/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json b/video_prediction_tools/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
rename to video_prediction_tools/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
diff --git a/video_prediction_savp/hparams/bair_action_free/ours_gan/model_hparams.json b/video_prediction_tools/hparams/bair_action_free/ours_gan/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/bair_action_free/ours_gan/model_hparams.json
rename to video_prediction_tools/hparams/bair_action_free/ours_gan/model_hparams.json
diff --git a/video_prediction_savp/hparams/bair_action_free/ours_savp/model_hparams.json b/video_prediction_tools/hparams/bair_action_free/ours_savp/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/bair_action_free/ours_savp/model_hparams.json
rename to video_prediction_tools/hparams/bair_action_free/ours_savp/model_hparams.json
diff --git a/video_prediction_savp/hparams/bair_action_free/ours_vae_l1/model_hparams.json b/video_prediction_tools/hparams/bair_action_free/ours_vae_l1/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/bair_action_free/ours_vae_l1/model_hparams.json
rename to video_prediction_tools/hparams/bair_action_free/ours_vae_l1/model_hparams.json
diff --git a/video_prediction_savp/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json b/video_prediction_tools/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
rename to video_prediction_tools/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
diff --git a/video_prediction_savp/hparams/era5/convLSTM/model_hparams.json b/video_prediction_tools/hparams/era5/convLSTM/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/era5/convLSTM/model_hparams.json
rename to video_prediction_tools/hparams/era5/convLSTM/model_hparams.json
diff --git a/video_prediction_savp/hparams/era5/mcnet/model_hparams.json b/video_prediction_tools/hparams/era5/mcnet/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/era5/mcnet/model_hparams.json
rename to video_prediction_tools/hparams/era5/mcnet/model_hparams.json
diff --git a/video_prediction_savp/hparams/era5/savp/model_hparams.json b/video_prediction_tools/hparams/era5/savp/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/era5/savp/model_hparams.json
rename to video_prediction_tools/hparams/era5/savp/model_hparams.json
diff --git a/video_prediction_savp/hparams/era5/vae/model_hparams.json b/video_prediction_tools/hparams/era5/vae/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/era5/vae/model_hparams.json
rename to video_prediction_tools/hparams/era5/vae/model_hparams.json
diff --git a/video_prediction_savp/hparams/kth/ours_deterministic_l1/model_hparams.json b/video_prediction_tools/hparams/kth/ours_deterministic_l1/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/kth/ours_deterministic_l1/model_hparams.json
rename to video_prediction_tools/hparams/kth/ours_deterministic_l1/model_hparams.json
diff --git a/video_prediction_savp/hparams/kth/ours_deterministic_l2/model_hparams.json b/video_prediction_tools/hparams/kth/ours_deterministic_l2/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/kth/ours_deterministic_l2/model_hparams.json
rename to video_prediction_tools/hparams/kth/ours_deterministic_l2/model_hparams.json
diff --git a/video_prediction_savp/hparams/kth/ours_gan/model_hparams.json b/video_prediction_tools/hparams/kth/ours_gan/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/kth/ours_gan/model_hparams.json
rename to video_prediction_tools/hparams/kth/ours_gan/model_hparams.json
diff --git a/video_prediction_savp/hparams/kth/ours_savp/model_hparams.json b/video_prediction_tools/hparams/kth/ours_savp/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/kth/ours_savp/model_hparams.json
rename to video_prediction_tools/hparams/kth/ours_savp/model_hparams.json
diff --git a/video_prediction_savp/hparams/kth/ours_vae_l1/model_hparams.json b/video_prediction_tools/hparams/kth/ours_vae_l1/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/kth/ours_vae_l1/model_hparams.json
rename to video_prediction_tools/hparams/kth/ours_vae_l1/model_hparams.json
diff --git a/video_prediction_savp/hparams/moving_mnist/convLSTM/model_hparams.json b/video_prediction_tools/hparams/moving_mnist/convLSTM/model_hparams.json
similarity index 100%
rename from video_prediction_savp/hparams/moving_mnist/convLSTM/model_hparams.json
rename to video_prediction_tools/hparams/moving_mnist/convLSTM/model_hparams.json
diff --git a/video_prediction_savp/main_scripts/main_data_extraction.py b/video_prediction_tools/main_scripts/main_data_extraction.py
similarity index 100%
rename from video_prediction_savp/main_scripts/main_data_extraction.py
rename to video_prediction_tools/main_scripts/main_data_extraction.py
diff --git a/video_prediction_savp/main_scripts/main_preprocess_data_step1.py b/video_prediction_tools/main_scripts/main_preprocess_data_step1.py
similarity index 100%
rename from video_prediction_savp/main_scripts/main_preprocess_data_step1.py
rename to video_prediction_tools/main_scripts/main_preprocess_data_step1.py
diff --git a/video_prediction_savp/main_scripts/main_preprocess_data_step2.py b/video_prediction_tools/main_scripts/main_preprocess_data_step2.py
similarity index 100%
rename from video_prediction_savp/main_scripts/main_preprocess_data_step2.py
rename to video_prediction_tools/main_scripts/main_preprocess_data_step2.py
diff --git a/video_prediction_savp/main_scripts/main_train_models.py b/video_prediction_tools/main_scripts/main_train_models.py
similarity index 100%
rename from video_prediction_savp/main_scripts/main_train_models.py
rename to video_prediction_tools/main_scripts/main_train_models.py
diff --git a/video_prediction_savp/main_scripts/main_visualize_postprocess.py b/video_prediction_tools/main_scripts/main_visualize_postprocess.py
similarity index 100%
rename from video_prediction_savp/main_scripts/main_visualize_postprocess.py
rename to video_prediction_tools/main_scripts/main_visualize_postprocess.py
diff --git a/video_prediction_savp/utils/external_function.py b/video_prediction_tools/utils/external_function.py
similarity index 100%
rename from video_prediction_savp/utils/external_function.py
rename to video_prediction_tools/utils/external_function.py
diff --git a/video_prediction_savp/utils/general_utils.py b/video_prediction_tools/utils/general_utils.py
similarity index 100%
rename from video_prediction_savp/utils/general_utils.py
rename to video_prediction_tools/utils/general_utils.py
diff --git a/video_prediction_savp/utils/metadata.py b/video_prediction_tools/utils/metadata.py
similarity index 100%
rename from video_prediction_savp/utils/metadata.py
rename to video_prediction_tools/utils/metadata.py
diff --git a/video_prediction_savp/utils/normalization.py b/video_prediction_tools/utils/normalization.py
similarity index 100%
rename from video_prediction_savp/utils/normalization.py
rename to video_prediction_tools/utils/normalization.py
diff --git a/video_prediction_savp/utils/prepare_era5_data.py b/video_prediction_tools/utils/prepare_era5_data.py
similarity index 100%
rename from video_prediction_savp/utils/prepare_era5_data.py
rename to video_prediction_tools/utils/prepare_era5_data.py
diff --git a/video_prediction_savp/utils/process_netCDF_v2.py b/video_prediction_tools/utils/process_netCDF_v2.py
similarity index 100%
rename from video_prediction_savp/utils/process_netCDF_v2.py
rename to video_prediction_tools/utils/process_netCDF_v2.py
diff --git a/video_prediction_savp/utils/shiftgrid.py b/video_prediction_tools/utils/shiftgrid.py
similarity index 100%
rename from video_prediction_savp/utils/shiftgrid.py
rename to video_prediction_tools/utils/shiftgrid.py
diff --git a/video_prediction_savp/utils/statistics.py b/video_prediction_tools/utils/statistics.py
similarity index 100%
rename from video_prediction_savp/utils/statistics.py
rename to video_prediction_tools/utils/statistics.py
diff --git a/video_prediction_savp/video_prediction/.DS_Store b/video_prediction_tools/video_prediction/.DS_Store
similarity index 100%
rename from video_prediction_savp/video_prediction/.DS_Store
rename to video_prediction_tools/video_prediction/.DS_Store
diff --git a/video_prediction_savp/video_prediction/__init__.py b/video_prediction_tools/video_prediction/__init__.py
similarity index 100%
rename from video_prediction_savp/video_prediction/__init__.py
rename to video_prediction_tools/video_prediction/__init__.py
diff --git a/video_prediction_savp/video_prediction/datasets/__init__.py b/video_prediction_tools/video_prediction/datasets/__init__.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/__init__.py
rename to video_prediction_tools/video_prediction/datasets/__init__.py
diff --git a/video_prediction_savp/video_prediction/datasets/base_dataset.py b/video_prediction_tools/video_prediction/datasets/base_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/base_dataset.py
rename to video_prediction_tools/video_prediction/datasets/base_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/cartgripper_dataset.py b/video_prediction_tools/video_prediction/datasets/cartgripper_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/cartgripper_dataset.py
rename to video_prediction_tools/video_prediction/datasets/cartgripper_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/era5_dataset.py b/video_prediction_tools/video_prediction/datasets/era5_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/era5_dataset.py
rename to video_prediction_tools/video_prediction/datasets/era5_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/google_robot_dataset.py b/video_prediction_tools/video_prediction/datasets/google_robot_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/google_robot_dataset.py
rename to video_prediction_tools/video_prediction/datasets/google_robot_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/kth_dataset.py b/video_prediction_tools/video_prediction/datasets/kth_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/kth_dataset.py
rename to video_prediction_tools/video_prediction/datasets/kth_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/moving_mnist.py b/video_prediction_tools/video_prediction/datasets/moving_mnist.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/moving_mnist.py
rename to video_prediction_tools/video_prediction/datasets/moving_mnist.py
diff --git a/video_prediction_savp/video_prediction/datasets/softmotion_dataset.py b/video_prediction_tools/video_prediction/datasets/softmotion_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/softmotion_dataset.py
rename to video_prediction_tools/video_prediction/datasets/softmotion_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/sv2p_dataset.py b/video_prediction_tools/video_prediction/datasets/sv2p_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/sv2p_dataset.py
rename to video_prediction_tools/video_prediction/datasets/sv2p_dataset.py
diff --git a/video_prediction_savp/video_prediction/datasets/ucf101_dataset.py b/video_prediction_tools/video_prediction/datasets/ucf101_dataset.py
similarity index 100%
rename from video_prediction_savp/video_prediction/datasets/ucf101_dataset.py
rename to video_prediction_tools/video_prediction/datasets/ucf101_dataset.py
diff --git a/video_prediction_savp/video_prediction/flow_ops.py b/video_prediction_tools/video_prediction/flow_ops.py
similarity index 100%
rename from video_prediction_savp/video_prediction/flow_ops.py
rename to video_prediction_tools/video_prediction/flow_ops.py
diff --git a/video_prediction_savp/video_prediction/layers/BasicConvLSTMCell.py b/video_prediction_tools/video_prediction/layers/BasicConvLSTMCell.py
similarity index 100%
rename from video_prediction_savp/video_prediction/layers/BasicConvLSTMCell.py
rename to video_prediction_tools/video_prediction/layers/BasicConvLSTMCell.py
diff --git a/video_prediction_savp/video_prediction/layers/__init__.py b/video_prediction_tools/video_prediction/layers/__init__.py
similarity index 100%
rename from video_prediction_savp/video_prediction/layers/__init__.py
rename to video_prediction_tools/video_prediction/layers/__init__.py
diff --git a/video_prediction_savp/video_prediction/layers/layer_def.py b/video_prediction_tools/video_prediction/layers/layer_def.py
similarity index 100%
rename from video_prediction_savp/video_prediction/layers/layer_def.py
rename to video_prediction_tools/video_prediction/layers/layer_def.py
diff --git a/video_prediction_savp/video_prediction/layers/mcnet_ops.py b/video_prediction_tools/video_prediction/layers/mcnet_ops.py
similarity index 100%
rename from video_prediction_savp/video_prediction/layers/mcnet_ops.py
rename to video_prediction_tools/video_prediction/layers/mcnet_ops.py
diff --git a/video_prediction_savp/video_prediction/layers/normalization.py b/video_prediction_tools/video_prediction/layers/normalization.py
similarity index 100%
rename from video_prediction_savp/video_prediction/layers/normalization.py
rename to video_prediction_tools/video_prediction/layers/normalization.py
diff --git a/video_prediction_savp/video_prediction/losses.py b/video_prediction_tools/video_prediction/losses.py
similarity index 100%
rename from video_prediction_savp/video_prediction/losses.py
rename to video_prediction_tools/video_prediction/losses.py
diff --git a/video_prediction_savp/video_prediction/metrics.py b/video_prediction_tools/video_prediction/metrics.py
similarity index 100%
rename from video_prediction_savp/video_prediction/metrics.py
rename to video_prediction_tools/video_prediction/metrics.py
diff --git a/video_prediction_savp/video_prediction/models/__init__.py b/video_prediction_tools/video_prediction/models/__init__.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/__init__.py
rename to video_prediction_tools/video_prediction/models/__init__.py
diff --git a/video_prediction_savp/video_prediction/models/base_model.py b/video_prediction_tools/video_prediction/models/base_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/base_model.py
rename to video_prediction_tools/video_prediction/models/base_model.py
diff --git a/video_prediction_savp/video_prediction/models/dna_model.py b/video_prediction_tools/video_prediction/models/dna_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/dna_model.py
rename to video_prediction_tools/video_prediction/models/dna_model.py
diff --git a/video_prediction_savp/video_prediction/models/mcnet_model.py b/video_prediction_tools/video_prediction/models/mcnet_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/mcnet_model.py
rename to video_prediction_tools/video_prediction/models/mcnet_model.py
diff --git a/video_prediction_savp/video_prediction/models/networks.py b/video_prediction_tools/video_prediction/models/networks.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/networks.py
rename to video_prediction_tools/video_prediction/models/networks.py
diff --git a/video_prediction_savp/video_prediction/models/non_trainable_model.py b/video_prediction_tools/video_prediction/models/non_trainable_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/non_trainable_model.py
rename to video_prediction_tools/video_prediction/models/non_trainable_model.py
diff --git a/video_prediction_savp/video_prediction/models/savp_model.py b/video_prediction_tools/video_prediction/models/savp_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/savp_model.py
rename to video_prediction_tools/video_prediction/models/savp_model.py
diff --git a/video_prediction_savp/video_prediction/models/sna_model.py b/video_prediction_tools/video_prediction/models/sna_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/sna_model.py
rename to video_prediction_tools/video_prediction/models/sna_model.py
diff --git a/video_prediction_savp/video_prediction/models/sv2p_model.py b/video_prediction_tools/video_prediction/models/sv2p_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/sv2p_model.py
rename to video_prediction_tools/video_prediction/models/sv2p_model.py
diff --git a/video_prediction_savp/video_prediction/models/vanilla_convLSTM_model.py b/video_prediction_tools/video_prediction/models/vanilla_convLSTM_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/vanilla_convLSTM_model.py
rename to video_prediction_tools/video_prediction/models/vanilla_convLSTM_model.py
diff --git a/video_prediction_savp/video_prediction/models/vanilla_vae_model.py b/video_prediction_tools/video_prediction/models/vanilla_vae_model.py
similarity index 100%
rename from video_prediction_savp/video_prediction/models/vanilla_vae_model.py
rename to video_prediction_tools/video_prediction/models/vanilla_vae_model.py
diff --git a/video_prediction_savp/video_prediction/ops.py b/video_prediction_tools/video_prediction/ops.py
similarity index 100%
rename from video_prediction_savp/video_prediction/ops.py
rename to video_prediction_tools/video_prediction/ops.py
diff --git a/video_prediction_savp/video_prediction/rnn_ops.py b/video_prediction_tools/video_prediction/rnn_ops.py
similarity index 100%
rename from video_prediction_savp/video_prediction/rnn_ops.py
rename to video_prediction_tools/video_prediction/rnn_ops.py
diff --git a/video_prediction_savp/video_prediction/utils/README.md b/video_prediction_tools/video_prediction/utils/README.md
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/README.md
rename to video_prediction_tools/video_prediction/utils/README.md
diff --git a/video_prediction_savp/video_prediction/utils/__init__.py b/video_prediction_tools/video_prediction/utils/__init__.py
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/__init__.py
rename to video_prediction_tools/video_prediction/utils/__init__.py
diff --git a/video_prediction_savp/video_prediction/utils/ffmpeg_gif.py b/video_prediction_tools/video_prediction/utils/ffmpeg_gif.py
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/ffmpeg_gif.py
rename to video_prediction_tools/video_prediction/utils/ffmpeg_gif.py
diff --git a/video_prediction_savp/video_prediction/utils/gif_summary.py b/video_prediction_tools/video_prediction/utils/gif_summary.py
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/gif_summary.py
rename to video_prediction_tools/video_prediction/utils/gif_summary.py
diff --git a/video_prediction_savp/video_prediction/utils/html.py b/video_prediction_tools/video_prediction/utils/html.py
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/html.py
rename to video_prediction_tools/video_prediction/utils/html.py
diff --git a/video_prediction_savp/video_prediction/utils/mcnet_utils.py b/video_prediction_tools/video_prediction/utils/mcnet_utils.py
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/mcnet_utils.py
rename to video_prediction_tools/video_prediction/utils/mcnet_utils.py
diff --git a/video_prediction_savp/video_prediction/utils/tf_utils.py b/video_prediction_tools/video_prediction/utils/tf_utils.py
similarity index 100%
rename from video_prediction_savp/video_prediction/utils/tf_utils.py
rename to video_prediction_tools/video_prediction/utils/tf_utils.py