Add back stabs as actions and reorganise packages