buildscript : update package and folder naming