Continued refactoring for Aristotle-Library-Apps integration