Restructuring of the files

Change-Id: I57fa34f84eb5f18ec2d9460503add9ef002eedea