Merge "Move all resources for PermissionController"