First commit
new structure
changed structure
Merge pull request #4 from Cuel/wip1

Wip1