reorganizing 3D branch