Moved xpi to proper place