Modify folders to packages
Merge pull request #5 from stevenh47/stevenh47_package

Modify folders to packages
Merge remote-tracking branch 'origin/dev' into map_dev_2