[enh] Refactoring, moved in tumulus subfolder.