new folder structure implemented