diff --git a/TTS/bin/convert_tacotron2_torch_to_tf.py b/TTS/bin/convert_tacotron2_torch_to_tf.py
index 485e56be..71fb8d5e 100644
--- a/TTS/bin/convert_tacotron2_torch_to_tf.py
+++ b/TTS/bin/convert_tacotron2_torch_to_tf.py
@@ -1,11 +1,7 @@
-# %%
-# %%
 import argparse
 from difflib import SequenceMatcher
 import os
 import sys
-# %%
-# print variable match
 from pprint import pprint
 
 import numpy as np
diff --git a/TTS/tts/layers/speedy_speech/__init__.py b/TTS/tts/layers/feed_forward/__init__.py
similarity index 100%
rename from TTS/tts/layers/speedy_speech/__init__.py
rename to TTS/tts/layers/feed_forward/__init__.py
diff --git a/TTS/tts/layers/speedy_speech/decoder.py b/TTS/tts/layers/feed_forward/decoder.py
similarity index 100%
rename from TTS/tts/layers/speedy_speech/decoder.py
rename to TTS/tts/layers/feed_forward/decoder.py
diff --git a/TTS/tts/layers/speedy_speech/duration_predictor.py b/TTS/tts/layers/feed_forward/duration_predictor.py
similarity index 100%
rename from TTS/tts/layers/speedy_speech/duration_predictor.py
rename to TTS/tts/layers/feed_forward/duration_predictor.py
diff --git a/TTS/tts/layers/speedy_speech/encoder.py b/TTS/tts/layers/feed_forward/encoder.py
similarity index 100%
rename from TTS/tts/layers/speedy_speech/encoder.py
rename to TTS/tts/layers/feed_forward/encoder.py
diff --git a/tests/test_encoder.py b/tests/test_speaker_encoder.py
similarity index 100%
rename from tests/test_encoder.py
rename to tests/test_speaker_encoder.py