Code Review - Bug fix and refactoring

Signed-off-by: Christian Amend <chrisam@apache.org>
Header class refactoring

Signed-off-by: Christian Amend <chrisam@apache.org>
Line number tracking and exception messages

Signed-off-by: Christian Amend <chrisam@apache.org>