Remove special Container.json so it looks like a slot

Add special Container.containerJson where necessary.