New project structure with Oslo

Change-Id: I738add287ce459281721261ec372d3150ab17ba8
Merge "New project structure with Oslo"