move files to common

Change-Id: Ib634ab3942f9d1862a01336da43b3773fe5f4db6