structure updates
Merge pull request #2 from PureMunky/master

structure updates