Revert "Resume"

This reverts commit c995af04cad5c6f4af8d979650d1f6bcbdd9a845.
New structure