Tidied up files and folders