Move all directory contents correctly