Extract class & interface from ActivatorFactory

Decouple actual activator build from the decoration step