Re-organization for clarity

Conflicts:
	raddb/README.rst