Move experimental data structures into different branch