First skeleton implementation for combined filter builder.
Some renaming.