converging to the new drupalci structure
Convergence step 2
Convergence step 3