Change-Id: I0583071421f2b0a7fb79ea0dbfde52b2c7cb20e0 Partial-Bug:#1280105
This renaming and change of project structure is necessary for adding the unit tests. Change-Id: I1893afbb05c86c83312983b12ce601d59a7fb417