Renamed core and variants folder