Further refactoring, add dependency on github dap