Removed unsued variable
Reworked matching object and structure to use a more flat structure to make sorting or paths easier.