Material filesystem refactor