update directories and wrapper protocol to run everything together