Merge pull request #2 from jrob119/Latest

Restructuring
Merge pull request #3 from jrob119/3170

Merge pull request #2 from jrob119/Latest