Revert "Merge pull request #39 from X-Plat/standard_container_path"

This reverts commit d7384ce2cce5c34085df9d5b1006f7a039fdf51c, reversing
changes made to cd4df9a94135350c9b283aa52318f1fc7b1d7207.
Revert "Merge pull request #41 from X-Plat/store_container_local"

This reverts commit cd4df9a94135350c9b283aa52318f1fc7b1d7207, reversing
changes made to da69b940eb00aa58531338e846b422cb9d428b55.