Reorganise policy control part of frontend