Move classes non related to codegen to main package

Change-Id: I9a78b00c5bc90ef21d75f66e6a15d9411c6d20ff