removed change directory logic
solved the folder switch problems