WIP
* Namespace cleanup
* Rework code "Yorba style" to help me ease into
  the planned GUI client