changed all private struct names to add underscores