Restructuring a bunch of things, now the layer7 matching is applied on the user side;