rearrange file and add MrAutoload