Structure changes
Merge pull request #1 from v3rm0n/structure

Structure changes