Updated build script to reflect restructured core-common-lib folder