Make ep.ui a proper namespace.
Merge branch 'develop' into fix/ticket105
Refers #105 -- Some cleanup