Completed the refactoring and problem identification for the NNL package