renamed the packages properly