Start of major refactoring to use military-apps-library-java