Plugin AP List: Code restructure and change handling of top portals