Tidied up and reorganised after Manchester workshop
Consolidated everything into one directory