reorganize files hierarchy