Changes to internal folder structure and packaging to reflect my general change to package naming.