new structure
Merge pull request #2 from Cuel/wip1

new structure