Boss Javi Calleja signs two-year Villarreal deal