changed structure
Merge pull request #1 from timohelken/v1

changed structure