Tiding up be for file move about ticket:8