Reorganize file tree structure