some refactoring to move folder and remove folder dependency