RF: changed filenames and tidied up a bit the scripts