Update id entry methodoloy

[fortiersteven]

• Remove EntryElement and only keep Entry object
• Update path based on new folder name structure
• Add Id and GroupId for the XML object