Tidied up a little and moved the scripts into subdirectories