Decoupled good-file

Fixes #210