Split makam fixtures to per-model files

Also remove 3 duplicate usuls