Rearranging file structure
Updates so that all CDID data provided by Rob gets parsed.
Merge branch 'master' of github.com:ONSdigital/tredegar
Merge branch 'master' of git@github.com:ONSdigital/tredegar.git