Tidied folder structure a bit, shifted scripts to top level subfolder.