Source vs. mention; source + publication + organization; reorganize code