Change file layout

Change file layout for future update