Moving papers to their own directory
Some more test refactoring