LAZY: Reorganize the files