working on pulling the tone generator in the basic oscillator together, also restructured packages a bit