Source code / build re-organization in-progress (unit test pass, but changes needed to build the dist and do integration tests)