Tidied up and arranged them into proper folders