Merge pull request #210 from akkie/master

Rename packages and rearrange the structure
Fix some typos