Move configuration to separate bundle