minor rearrangment for clarity
moved over audio2 msw utils to cinder/msw/CinderMsw