Adding Message package, reorganizing