refactored TagHanlder.java
removed HeaderTagModel.java
merged conflicts