Put the papertrail in the right spot, as well as proper dependencies