change of structure for best usability
Merge pull request #3 from Lardjo/master

Some changes in structure of project