Moved all metadata into a single file
Fixed up example scripts
Fixed up test script
Some new copy