Added xpath element
WIP: goto shortnamepath
Removed unused files and functions, it works