Restructuring files

Change-Id: Id465ee2acd9e5f2ace70accf2dd8cab5a5125816