Adding or moving CONTENTS files for all namespace directories
Merge branch 'sp' into devel