Remove Storage and Profile, Move folders, add EncryptedInsightStorage