Fixes to remove fs references.
Renamed packages.