Changed location of libs to use NON-SUBMODULE locations