Changed package names to avoid name conflicts
Updated resource locations
Merge branch 'package_names'
Update to version 2.0