Rename to add the .dws extension
Reording some code
Put the paper workspace in the right place