zero-thickness talk added; reorganize into 2 folders