Massive revision of final draft report

Moved some files from maps folder - must tidy up...