Further reorganization; update Readme; add back some filters