Fix performance issue
move files