renaming package names. fixed #12