Renamed the packages

Conventions for the win !