More package refactoring/naming to ensure build server builds correct tests