X11: File movment and fixes