Restructured JsFunction packages, and resolved a bug that resulted from a JsFunction bug fix