Updated to a convention where model, protocol and storage are named imports.