Renamed files, organised tree.
Merge pull request #32 from paulld/filter_matches

Renamed files, organised tree.