Merge pull request #8 from shearl/master

Metadata move + renaming
Minor changes.
resolved conflict