Simplify data structures

[remiges-sachin]

We can simplify the following data structures:

type Attr struct {
	name string
	val  string
}

type Property struct {
	name string
	val  string
}

We can have a simple map[string]string for Attr and Property.

Make the required changes in the code and tests and verify that the tests pass.