issue#130 - reorganized directory tree
Merge pull request #131 from igoryen/issue#130

issue#130 - reorganized directory tree