Update structure
Merge pull request #242 from jmpascal/MERGING-1

Update structure