Added npm-debug to ignore
Complete template restructure
Separated match logic out
Removed
Completed match tests