new folder structure
new folder (cont.)
fix output folder