Tidied up dirs and scripts.