CHG: Refactoring, move Permissions and PermissionManager to Correct package