Updated basic structure of package.