Fix compilation error introduced in the 534c297 and 7eaada5

* Invalid package name
* Restore removed class