renaming packages and bug fixes