Fix issue #286 - Renaming a file end up with two copies

Closes #286.
I don't understand this style.  It's better to just have multiple static versions of the layout, i.e.:

```js
var initialLayout = {...};
var expectedLayout = {...};
```
Hard code each.