Reorganise policies index

Basic initial cleanup to policy#index