Renamed the package so it follows the naming standard in use in this class