diff --git a/codes/models/waveglow/__init__.py b/codes/models/audio/__init__.py
similarity index 100%
rename from codes/models/waveglow/__init__.py
rename to codes/models/audio/__init__.py
diff --git a/codes/models/audio/vocoders/__init__.py b/codes/models/audio/vocoders/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/codes/models/audio/vocoders/waveglow/__init__.py b/codes/models/audio/vocoders/waveglow/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/codes/models/waveglow/denoiser.py b/codes/models/audio/vocoders/waveglow/denoiser.py
similarity index 100%
rename from codes/models/waveglow/denoiser.py
rename to codes/models/audio/vocoders/waveglow/denoiser.py
diff --git a/codes/models/waveglow/waveglow.py b/codes/models/audio/vocoders/waveglow/waveglow.py
similarity index 100%
rename from codes/models/waveglow/waveglow.py
rename to codes/models/audio/vocoders/waveglow/waveglow.py
diff --git a/codes/scripts/audio/test_audio_gen.py b/codes/scripts/audio/test_audio_gen.py
index e62b3c80..e32c4f89 100644
--- a/codes/scripts/audio/test_audio_gen.py
+++ b/codes/scripts/audio/test_audio_gen.py
@@ -8,7 +8,7 @@ import torchvision
 import utils
 import utils.options as option
 import utils.util as util
-from models.waveglow.denoiser import Denoiser
+from models.audio.vocoders.waveglow import Denoiser
 from trainer.ExtensibleTrainer import ExtensibleTrainer
 from data import create_dataset, create_dataloader
 from tqdm import tqdm
diff --git a/codes/scripts/audio/use_vocoder.py b/codes/scripts/audio/use_vocoder.py
index 866087e0..aa6d7063 100644
--- a/codes/scripts/audio/use_vocoder.py
+++ b/codes/scripts/audio/use_vocoder.py
@@ -1,8 +1,7 @@
 import torch
 from scipy.io import wavfile
 
-from models.waveglow.waveglow import WaveGlow
-from utils.audio import plot_spectrogram
+from models.audio.vocoders.waveglow.waveglow import WaveGlow
 
 
 class Vocoder: