RM-6153 Renamed folder structure