am 582393a1: Merge "Fixing build and continuing refactor" into klp-dev

* commit '582393a166ee443e718f323a194ad638322f46c7':
  Fixing build and continuing refactor