Further moving and shaking of files and directories