fixSource now fully functional, along with addtoPackage and CreatePackage