move OPT3 from subrepo to normal files