Add CDI and initial DSL Controller

Change-Id: I235991583c134aaf917e96ab0b780988e70f1a84