Rearrange code, switch to obuild

Signed-off-by: John Else <john.else@citrix.com>