renamed all packages to reflect research appropriately