Moved common files out into base app

Change-Id: Ic755654b357be462e27ea14fd9763bdb564cb852