Update to new filesystem layout