Moved Week.
Renamed Conflict to ConflictFinder.
Added Conflict Entity.