structure changes
Merge pull request #6 from sahak522/dev

structure changes