refac. & directory change