Updated UI components to live in UI module.

:guitar: