Revert "Cleanup (1/2)"

This reverts commit b71152ed79b94a1579f952eda230514c9dbdbd91.
Revert "Remove ooverlay"

This reverts commit e4f9af8a46db5a1361a6102044dee514eb6c5a81.