Reset the strange duplicate folder problem I introduced in last commit...