Refactor package, added jsonapi and lwc support back