Post filter-branch tidyups

Remove content we don't need any more, move files to more
suitable places.