Move from klass lib to pjs