tidied up the file structure