Changed code due to remarks and moved wavelets to sub packages.