policy topic restructure (closes #111)