Compile 7.1 - Entanglement class reorganized