Sorting out package naming and the like

Needed to be clearer and less "Stuffy"