Code cleanup and remove unnecessary wrapper
removing storage name from Metadata as first class citizen, replacing it with annotations where appropriate. CR: Emil, Arthur, Andrew, Nate