For the past several years the Fedora community has prioritized alignment with linked data best practices and modern web standards. We are now shifting our attention back to Fedora’s digital preservation roots with a focus on the Oxford Common File Layout (OCFL). The OFCL is an application-independent approach to the storage of digital objects in a structured, transparent, and predictable manner. Fedora 6, the next major release, will replace the current ModeShape backend with a more scalable and performant implementation that persists data in accordance with the OCFL specification. This presentation will provide an overview of the Fedora 6 design and a summary of development progress to date, including a brief introduction to the OCFL and how it is being implemented.