More reverting to original plugins/ and hooks/