restructure package to clearly define end to end vs unit test packages, update relevant code/build files