Structure of files tidied up