Rearranged package structure. Very minor cleanup.