diff --git a/deep_speech_2/README.md b/deep_speech_2/README.md
index 4e8befa5be4b5649bdb391959b0ee50a5895a1dc..db07d8c2011465b98048a6e54ce82503223334cb 100644
--- a/deep_speech_2/README.md
+++ b/deep_speech_2/README.md
@@ -1,5 +1,7 @@
 # DeepSpeech2 on PaddlePaddle
 
+>TODO: to be updated, since the directory hierarchy was changed.
+
 ## Installation
 
 ```
diff --git a/deep_speech_2/utils/decoder.py b/deep_speech_2/models/decoder.py
similarity index 100%
rename from deep_speech_2/utils/decoder.py
rename to deep_speech_2/models/decoder.py
diff --git a/deep_speech_2/models/model.py b/deep_speech_2/models/model.py
index 3e6fc328abd747bd8f8ce164b74dbf5745fa949a..93c4c41bf761a519f7f6e70bd5221cec9773f3f9 100644
--- a/deep_speech_2/models/model.py
+++ b/deep_speech_2/models/model.py
@@ -8,8 +8,8 @@ import os
 import time
 import gzip
 import paddle.v2 as paddle
-from utils.decoder import ctc_greedy_decoder, ctc_beam_search_decoder
 from lm.lm_scorer import LmScorer
+from models.decoder import ctc_greedy_decoder, ctc_beam_search_decoder
 from models.network import deep_speech_v2_network
 
 
diff --git a/deep_speech_2/tests/test_decoders.py b/deep_speech_2/models/tests/test_decoders.py
similarity index 100%
rename from deep_speech_2/tests/test_decoders.py
rename to deep_speech_2/models/tests/test_decoders.py
diff --git a/deep_speech_2/evaluate.py b/deep_speech_2/test.py
similarity index 100%
rename from deep_speech_2/evaluate.py
rename to deep_speech_2/test.py
diff --git a/deep_speech_2/tests/test_error_rate.py b/deep_speech_2/utils/tests/test_error_rate.py
similarity index 100%
rename from deep_speech_2/tests/test_error_rate.py
rename to deep_speech_2/utils/tests/test_error_rate.py