Reorganisation of gem and removal of savon dependency

um yeah, bit backwards merging from master into develop but I hadn't switched branches. will do after this