move files to common

Change-Id: Ib7707cae3d1286c22b043022f050cc02c98f37bb