-use crate::formats::*;
-use crate::frame::*;
-use super::super::*;
-use crate::dsp::fft::FFTMode;
-use crate::dsp::mdct::IMDCT;
-use crate::io::bitreader::*;
-use crate::io::byteio::{ByteReader, MemoryReader};
-use crate::io::codebook::*;
-use crate::io::intcode::*;
+use std::rc::Rc;
+use std::cell::RefCell;
+use nihav_core::formats::*;
+use nihav_core::frame::*;
+use nihav_core::codecs::*;
+use nihav_core::dsp::fft::FFTMode;
+use nihav_core::dsp::mdct::IMDCT;
+use nihav_core::io::bitreader::*;
+use nihav_core::io::byteio::{ByteReader, MemoryReader};
+use nihav_core::io::codebook::*;
+use nihav_core::io::intcode::*;
use std::f32::consts;
use std::mem::swap;