restructure path handling
fix up signing