Removed StorefrontInfo and arranged code in 'data'