starting to refactor savanna module

Change-Id: If47e357c4bf30203687f7784b893836ae144373b