merge madness (folder reorg)