modifications to structure
Merge pull request #2 from ebeal/master

Structure modification