Renamed things in preparation to release as separate package