Code tidy up and reorganisation of index.js. Added handlers folder to gr...

...oup routes logically