Split project in two modules

Change-Id: Ibb1608e6e86762e8b7c41b977e4cef4845f837af