Minor organization or CodeGenerator

Change-Id: If7893be0d4ba855c7b6cfda35360ce8097d7f815