Restructured data folder