mod/add. move handlers outside of apache context.

Change-Id: I0b6ab2b5f0394b36a9b756fa20441609ab18550c