Structure improvements and reduction.
Structure improvements and reduction.

More cleanup and reduction

tormi/WunderWay,joesb/WunderWay,wunderkraut/WunderWay,tormi/WunderWay,joesb/WunderWay,wunderkraut/WunderWay