Adding folder structure properly