Restructure project + fix matcher