Merging app and storage packages.