Fixed folder copy logic