inital check-in of improvements to package structure