Clean up and re-organise VisualEditor configuration

Change-Id: I48ca5254576ca6d48dfe800c6d79a640b5ee9467