Rename some files and rearrange some codes