Renamed plugins to make merge easier with nebula.
Renamed packages.