Clean up.
Renamed package folder.