Restructuring project
Merge pull request #7 from fkmhrk/project-restructure

Restructuring project