Reshape of the package to modularize it