Devstack modular.

Different patches to make devstack more modular.