Update oslo code and split the module lines

Change-Id: I2d9f4b9ac585d91c2d7651db96c9440ff683e0ef