Tidied up file structure