g2: Cleanup common folder

Holy cow, this thing's a mess... Clean it up a bit
to prepare to bigger updates (like caf-8974)

Change-Id: I6b0919bfb69d91291206921f35caa05b62694d7d