Make extracted org commands interactive
Remove custom org prefix keymap and consolidate under fn keys