folder refactoring and destination changed