restructured the code into packages
Merge remote-tracking branch 'upstream/master'
Merge pull request #195 from eroncanc/master

restructured the code into packages