Moved everything to wavelet.py + added originals back