reorganize file layout