merged presentation/* and spring/* files.