Bring app/storage back until version control