Moved OII to standard location