OAT restructure merge