Changed to use NON-SUBMODULE libs