Refactor activation

Refactor all object creation into separate classes selected depending on the build strategy (normal, static builder, instance builder)