moved visitor into model
restructured packages to show differenes between filter types