apply new design and structure
Merge pull request #35 from yurybolbas/master

apply new design and structure