updated according to new folders