Updated Map for struct and arg naming scheme, typedefs
Updated test program to fit reworked datatypes