Simplify reroot

Previously had an odd behavior of traversing through prefix paths.
Merge divergent reroot changes

Conflicts:
	fs-common.js