more reorganization; added filtering by function names and TODOs