Modularize the package
0.0.2