Merge master's func folders