structural changes - added package constants