Move back to one package, make other classes than CaptureFilter package-private