Still refactoring to support aristotle-library-apps as submodule