NPL App restructured