US25-CodeReview for all packages

Change work flow between new and old classes