Add separate metadata file, fix templates, fix image references.
Clean up templates