Nit-picky code-reorg (test directory under src)