Even more moves.

  include/ui + ui/
  include/qapi/qmp/ + qobject/

Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035
diff --git a/Makefile.target b/Makefile.target
index aff7736..e21a507 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -267,9 +267,9 @@
 # What a mess, os-posix.c depends on the exact values of options
 # which are target specific.
 ifeq ($(HOST_OS),windows)
-    common_LOCAL_SRC_FILES += os-win32.c oslib-win32.c
+    common_LOCAL_SRC_FILES += os-win32.c util/oslib-win32.c
 else
-    common_LOCAL_SRC_FILES += os-posix.c oslib-posix.c
+    common_LOCAL_SRC_FILES += os-posix.c util/oslib-posix.c
 endif