Changed package name
Changed Storage class name