changed structure for building package