Move activities into the ui folder