Moved wavelet transforms to package
Removed commented code & duplication