modified structure
Merge pull request #2 from goldeneggg/feature/mod-structure

modified structure