Packed 2 classes in UI

Started to pack the UI component into packages
Merge