rearraning the folder layout