Finished mv.
Merge branch 'brownyoda' into cevans

Conflicts:
	filesystem.c