diff --git a/.gitmodules b/.gitmodules
index 7dba103..6ab997c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "glow-tts-jaywalnut/glow-tts"]
-	path = glow-tts-jaywalnut/glow-tts
-	url = git@github.com:ml-applications/glow-tts.git
+#[submodule "glow-tts-jaywalnut/glow-tts"]
+#	path = glow-tts-jaywalnut/glow-tts
+#	url = git@github.com:ml-applications/glow-tts.git
 [submodule "glow-tts-jaywalnut/apex"]
 	path = glow-tts-jaywalnut/apex
 	url = https://github.com/NVIDIA/apex.git
diff --git a/glow-tts-jaywalnut/glow-tts b/glow-tts-jaywalnut/glow-tts
deleted file mode 160000
index 3a42332..0000000
--- a/glow-tts-jaywalnut/glow-tts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3a423326e50cabb933e811435064736d9a2374da
diff --git a/glow-tts-jaywalnut/glow-tts-2/.gitignore b/glow-tts-jaywalnut/glow-tts/.gitignore
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/.gitignore
rename to glow-tts-jaywalnut/glow-tts/.gitignore
diff --git a/glow-tts-jaywalnut/glow-tts-2/LICENSE b/glow-tts-jaywalnut/glow-tts/LICENSE
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/LICENSE
rename to glow-tts-jaywalnut/glow-tts/LICENSE
diff --git a/glow-tts-jaywalnut/glow-tts-2/README.md b/glow-tts-jaywalnut/glow-tts/README.md
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/README.md
rename to glow-tts-jaywalnut/glow-tts/README.md
diff --git a/glow-tts-jaywalnut/glow-tts-2/attentions.py b/glow-tts-jaywalnut/glow-tts/attentions.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/attentions.py
rename to glow-tts-jaywalnut/glow-tts/attentions.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/audio_processing.py b/glow-tts-jaywalnut/glow-tts/audio_processing.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/audio_processing.py
rename to glow-tts-jaywalnut/glow-tts/audio_processing.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/commons.py b/glow-tts-jaywalnut/glow-tts/commons.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/commons.py
rename to glow-tts-jaywalnut/glow-tts/commons.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/configs/base.json b/glow-tts-jaywalnut/glow-tts/configs/base.json
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/configs/base.json
rename to glow-tts-jaywalnut/glow-tts/configs/base.json
diff --git a/glow-tts-jaywalnut/glow-tts-2/data/cmu_dictionary b/glow-tts-jaywalnut/glow-tts/data/cmu_dictionary
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/data/cmu_dictionary
rename to glow-tts-jaywalnut/glow-tts/data/cmu_dictionary
diff --git a/glow-tts-jaywalnut/glow-tts-2/data_utils.py b/glow-tts-jaywalnut/glow-tts/data_utils.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/data_utils.py
rename to glow-tts-jaywalnut/glow-tts/data_utils.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/filelists/ljs_audio_text_test_filelist.txt b/glow-tts-jaywalnut/glow-tts/filelists/ljs_audio_text_test_filelist.txt
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/filelists/ljs_audio_text_test_filelist.txt
rename to glow-tts-jaywalnut/glow-tts/filelists/ljs_audio_text_test_filelist.txt
diff --git a/glow-tts-jaywalnut/glow-tts-2/filelists/ljs_audio_text_train_filelist.txt b/glow-tts-jaywalnut/glow-tts/filelists/ljs_audio_text_train_filelist.txt
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/filelists/ljs_audio_text_train_filelist.txt
rename to glow-tts-jaywalnut/glow-tts/filelists/ljs_audio_text_train_filelist.txt
diff --git a/glow-tts-jaywalnut/glow-tts-2/filelists/ljs_audio_text_val_filelist.txt b/glow-tts-jaywalnut/glow-tts/filelists/ljs_audio_text_val_filelist.txt
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/filelists/ljs_audio_text_val_filelist.txt
rename to glow-tts-jaywalnut/glow-tts/filelists/ljs_audio_text_val_filelist.txt
diff --git a/glow-tts-jaywalnut/glow-tts-2/inference.ipynb b/glow-tts-jaywalnut/glow-tts/inference.ipynb
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/inference.ipynb
rename to glow-tts-jaywalnut/glow-tts/inference.ipynb
diff --git a/glow-tts-jaywalnut/glow-tts-2/init.py b/glow-tts-jaywalnut/glow-tts/init.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/init.py
rename to glow-tts-jaywalnut/glow-tts/init.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/models.py b/glow-tts-jaywalnut/glow-tts/models.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/models.py
rename to glow-tts-jaywalnut/glow-tts/models.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/modules.py b/glow-tts-jaywalnut/glow-tts/modules.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/modules.py
rename to glow-tts-jaywalnut/glow-tts/modules.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/stft.py b/glow-tts-jaywalnut/glow-tts/stft.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/stft.py
rename to glow-tts-jaywalnut/glow-tts/stft.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/text/LICENSE b/glow-tts-jaywalnut/glow-tts/text/LICENSE
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/text/LICENSE
rename to glow-tts-jaywalnut/glow-tts/text/LICENSE
diff --git a/glow-tts-jaywalnut/glow-tts-2/text/__init__.py b/glow-tts-jaywalnut/glow-tts/text/__init__.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/text/__init__.py
rename to glow-tts-jaywalnut/glow-tts/text/__init__.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/text/cleaners.py b/glow-tts-jaywalnut/glow-tts/text/cleaners.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/text/cleaners.py
rename to glow-tts-jaywalnut/glow-tts/text/cleaners.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/text/cmudict.py b/glow-tts-jaywalnut/glow-tts/text/cmudict.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/text/cmudict.py
rename to glow-tts-jaywalnut/glow-tts/text/cmudict.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/text/numbers.py b/glow-tts-jaywalnut/glow-tts/text/numbers.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/text/numbers.py
rename to glow-tts-jaywalnut/glow-tts/text/numbers.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/text/symbols.py b/glow-tts-jaywalnut/glow-tts/text/symbols.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/text/symbols.py
rename to glow-tts-jaywalnut/glow-tts/text/symbols.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/train.py b/glow-tts-jaywalnut/glow-tts/train.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/train.py
rename to glow-tts-jaywalnut/glow-tts/train.py
diff --git a/glow-tts-jaywalnut/glow-tts-2/train_ddi.sh b/glow-tts-jaywalnut/glow-tts/train_ddi.sh
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/train_ddi.sh
rename to glow-tts-jaywalnut/glow-tts/train_ddi.sh
diff --git a/glow-tts-jaywalnut/glow-tts-2/utils.py b/glow-tts-jaywalnut/glow-tts/utils.py
similarity index 100%
rename from glow-tts-jaywalnut/glow-tts-2/utils.py
rename to glow-tts-jaywalnut/glow-tts/utils.py