Fix package structure and typos in name
Merge pull request #3 from mbbx6spp/fix-package-structure

Fix package structure and typos in name