Added a number converter for some ammo-values

Also updated the codestructure a bit