refactor to keep types isolated#1

Mewsen merged 1 commit intoMewsen:issue/6188Mewsen/cli:issue/6188from

thaJeztah:review_suggestionsthaJeztah/cli:review_suggestionsCopy head branch name to clipboard