[src][test] cleaning out cruft, reorganizing code files
[src][test] First passing tests, woo\!  Let the refactor commence