One folder less, for leaner structure
Make Travis likes new project structure
Merge branch 'AGIOS-94'