Try and make library more readable by spliting the list of files over
multiple lines. Update the tests to follow same principle.
Add header line, add tag as a field.