Merge pull request #6 from deomitrus/dev

v0.0.11
Changed configuration and moved/renamed files