tidied up the folder structure