Revert "new structure"
Merge pull request #3 from Cuel/revert-2-wip1

Revert "new structure"