Revert "Marked OQuaRE materials to move, added some annotations"

This reverts commit c7a256924812eb81cae0b2f553c648d7b254fedf.