restructure and interface/tunnel work