Metadata almost complete. Just need authors now.
Move and tweak metadata templates