merged the package/build files of the 2 modules