reorganized the package, fixed #15