changed file structure
Merge branch 'graphinterface'
Changed file structure on branch