Un-fuck-up directory structure, add notify titles.