Fix structure dump

Remove environment prefix from filename - fix to yesterday's PR. #9 

It's definitely not DRY code but I don't wan to do  any refactoring to easily apply those patches to `3-1` later.

/cc @tamird