target: restructure dap support