minor layout changes / package renaming