admintool refactor upload 9: move non-grouped commands to seperate class and set private to public