Merge pull request #2 from jrob119/Latest

Restructuring