change folder structure for good