Put UI in its own module.
Changed import to accomodate new ui module.