Add USC's changes to conform to Luke's new structure.
Merge pull request #1 from jordandukart/7.x-usc-puppet

Add USC's changes to conform to Luke's new structure.