restructure for trivial deployment