Relocating CDI for easy swaps?