Organizing the folder structure