Modularize packages
0.0.26