Move calculation table to correct package