Merge "Restructure CLAMP documentation tree"