reorganize packages, start with tui
merge resolved