Reorganised files
Work towards making GH graph reusable