This renaming and change of project structure is necessary for adding the unit tests. Change-Id: I1893afbb05c86c83312983b12ce601d59a7fb417
sslypushenko