Entry and EntryList reorganization
TagLocations and  test.
Error line number change