Added FS map, and fixed directory names + osregister