Restructure dir
Update README
Merge pull request #7 from cmpitg/master

Restructure the project