Package refactored to new Nx pattern