move files out of common