Added new folder structure.