More conventional package naming.
Also cleaned up the string definitions.