Refactored Entry and Dictionary

Replaced Entry and Dictionary with EntryTwo and EntryDictionary to come
in line with new requirements