Renamed package names. Thanks to Edgar.
Merge branch 'package'