Simplify datafiles

fixes #39