Merged geometry-v3-lastIB from repository shervin86
fixed wrong packages in BuildFiles