AOJP Settings move to common