Updated entity file name, added Storage spec (first draft)