More filtering; moved a file to the proper location
More filter work