Tidying of file structure.