Rearrange files, update Menu