Refactor Account

Account is actually Account metadata.