cleanup; improve comp25;
move bigger comps to their own dirs
split mondrian and focal into multiple files