Structure updates
Merge pull request #3 from AuditeMarlow/niek

Structure updates