Updated filesystem structure