Restructure

Major restructure.  Yea.