added new folder structure