Tidied up root dir