Issue #887/#888

The PR includes fixes for #887 and #888 (file vesron).
one change here, please.  Could the "sample_data" folder go into a "sample_data" folder in the Project? It's currently at the top-level, but the user's own files should go in that top level.