odin: reorganize and cleanup

Change-Id: I9b72704ee5290e8c60aef0dbefca930e9395eafc