Perhaps it's time we put ItemConverter etc into the right namespace.

Change-Id: I8082c51ff82568b8a00f92e5ab20263c017f1265