Move activities into UI package
Rename components, remove unused layouts