changed folder code a bit