fixed new folder structure.