Fix folder duplication