Refactoring of the file layout

Change-Id: I16cb0b2b8613b2333778633afca94c64cd8d4cfe