Rewritten configurator classes. They will now follow DDD.