Tidied up file directory structure