Reorganize file layout