fixes #252 (and hopefully #248...)
renamed files for easier debugging