Complete Restructure

Structued class location, added/deleted some.  Major overhaul.