Readjust folder layout