Reorganize files hierarchy