Added groundwork for the dependency injection system

Change-Id: I2dfa4dc4820f5154b8342b4d85ac7fc98c6c2546