Committed before renaming the package
Renamed it... fixing compile errors & dependencies
Renamed package. Still work in progress