Modified the files to bring things into line with the spec setout in the README file at root. Needs testing now.