Changed rename/merge to move, and added a load of comments