changed package names because the plurals bothered me