Re-organise matrix constants