Plugin AP List: Code restructure