diff --git a/libs/utils/Android.mk b/libutils/Android.mk
similarity index 100%
rename from libs/utils/Android.mk
rename to libutils/Android.mk
diff --git a/libs/utils/BasicHashtable.cpp b/libutils/BasicHashtable.cpp
similarity index 100%
rename from libs/utils/BasicHashtable.cpp
rename to libutils/BasicHashtable.cpp
diff --git a/libs/utils/BlobCache.cpp b/libutils/BlobCache.cpp
similarity index 100%
rename from libs/utils/BlobCache.cpp
rename to libutils/BlobCache.cpp
diff --git a/libs/utils/CallStack.cpp b/libutils/CallStack.cpp
similarity index 100%
rename from libs/utils/CallStack.cpp
rename to libutils/CallStack.cpp
diff --git a/libs/utils/CleanSpec.mk b/libutils/CleanSpec.mk
similarity index 100%
rename from libs/utils/CleanSpec.mk
rename to libutils/CleanSpec.mk
diff --git a/libs/utils/FileMap.cpp b/libutils/FileMap.cpp
similarity index 100%
rename from libs/utils/FileMap.cpp
rename to libutils/FileMap.cpp
diff --git a/libs/utils/JenkinsHash.cpp b/libutils/JenkinsHash.cpp
similarity index 100%
rename from libs/utils/JenkinsHash.cpp
rename to libutils/JenkinsHash.cpp
diff --git a/libs/utils/LinearAllocator.cpp b/libutils/LinearAllocator.cpp
similarity index 100%
rename from libs/utils/LinearAllocator.cpp
rename to libutils/LinearAllocator.cpp
diff --git a/libs/utils/LinearTransform.cpp b/libutils/LinearTransform.cpp
similarity index 100%
rename from libs/utils/LinearTransform.cpp
rename to libutils/LinearTransform.cpp
diff --git a/libs/utils/Log.cpp b/libutils/Log.cpp
similarity index 100%
rename from libs/utils/Log.cpp
rename to libutils/Log.cpp
diff --git a/libs/utils/Looper.cpp b/libutils/Looper.cpp
similarity index 100%
rename from libs/utils/Looper.cpp
rename to libutils/Looper.cpp
diff --git a/libs/utils/MODULE_LICENSE_APACHE2 b/libutils/MODULE_LICENSE_APACHE2
similarity index 100%
rename from libs/utils/MODULE_LICENSE_APACHE2
rename to libutils/MODULE_LICENSE_APACHE2
diff --git a/libs/utils/NOTICE b/libutils/NOTICE
similarity index 100%
rename from libs/utils/NOTICE
rename to libutils/NOTICE
diff --git a/libs/utils/PropertyMap.cpp b/libutils/PropertyMap.cpp
similarity index 100%
rename from libs/utils/PropertyMap.cpp
rename to libutils/PropertyMap.cpp
diff --git a/libs/utils/README b/libutils/README
similarity index 100%
rename from libs/utils/README
rename to libutils/README
diff --git a/libs/utils/RefBase.cpp b/libutils/RefBase.cpp
similarity index 100%
rename from libs/utils/RefBase.cpp
rename to libutils/RefBase.cpp
diff --git a/libs/utils/SharedBuffer.cpp b/libutils/SharedBuffer.cpp
similarity index 100%
rename from libs/utils/SharedBuffer.cpp
rename to libutils/SharedBuffer.cpp
diff --git a/libs/utils/Static.cpp b/libutils/Static.cpp
similarity index 100%
rename from libs/utils/Static.cpp
rename to libutils/Static.cpp
diff --git a/libs/utils/StopWatch.cpp b/libutils/StopWatch.cpp
similarity index 100%
rename from libs/utils/StopWatch.cpp
rename to libutils/StopWatch.cpp
diff --git a/libs/utils/String16.cpp b/libutils/String16.cpp
similarity index 100%
rename from libs/utils/String16.cpp
rename to libutils/String16.cpp
diff --git a/libs/utils/String8.cpp b/libutils/String8.cpp
similarity index 100%
rename from libs/utils/String8.cpp
rename to libutils/String8.cpp
diff --git a/libs/utils/SystemClock.cpp b/libutils/SystemClock.cpp
similarity index 100%
rename from libs/utils/SystemClock.cpp
rename to libutils/SystemClock.cpp
diff --git a/libs/utils/Threads.cpp b/libutils/Threads.cpp
similarity index 100%
rename from libs/utils/Threads.cpp
rename to libutils/Threads.cpp
diff --git a/libs/utils/Timers.cpp b/libutils/Timers.cpp
similarity index 100%
rename from libs/utils/Timers.cpp
rename to libutils/Timers.cpp
diff --git a/libs/utils/Tokenizer.cpp b/libutils/Tokenizer.cpp
similarity index 100%
rename from libs/utils/Tokenizer.cpp
rename to libutils/Tokenizer.cpp
diff --git a/libs/utils/Trace.cpp b/libutils/Trace.cpp
similarity index 100%
rename from libs/utils/Trace.cpp
rename to libutils/Trace.cpp
diff --git a/libs/utils/Unicode.cpp b/libutils/Unicode.cpp
similarity index 100%
rename from libs/utils/Unicode.cpp
rename to libutils/Unicode.cpp
diff --git a/libs/utils/VectorImpl.cpp b/libutils/VectorImpl.cpp
similarity index 100%
rename from libs/utils/VectorImpl.cpp
rename to libutils/VectorImpl.cpp
diff --git a/libs/utils/misc.cpp b/libutils/misc.cpp
similarity index 100%
rename from libs/utils/misc.cpp
rename to libutils/misc.cpp
diff --git a/libs/utils/primes.py b/libutils/primes.py
similarity index 100%
rename from libs/utils/primes.py
rename to libutils/primes.py
diff --git a/libs/utils/tests/Android.mk b/libutils/tests/Android.mk
similarity index 100%
rename from libs/utils/tests/Android.mk
rename to libutils/tests/Android.mk
diff --git a/libs/utils/tests/BasicHashtable_test.cpp b/libutils/tests/BasicHashtable_test.cpp
similarity index 100%
rename from libs/utils/tests/BasicHashtable_test.cpp
rename to libutils/tests/BasicHashtable_test.cpp
diff --git a/libs/utils/tests/BitSet_test.cpp b/libutils/tests/BitSet_test.cpp
similarity index 100%
rename from libs/utils/tests/BitSet_test.cpp
rename to libutils/tests/BitSet_test.cpp
diff --git a/libs/utils/tests/BlobCache_test.cpp b/libutils/tests/BlobCache_test.cpp
similarity index 100%
rename from libs/utils/tests/BlobCache_test.cpp
rename to libutils/tests/BlobCache_test.cpp
diff --git a/libs/utils/tests/Looper_test.cpp b/libutils/tests/Looper_test.cpp
similarity index 100%
rename from libs/utils/tests/Looper_test.cpp
rename to libutils/tests/Looper_test.cpp
diff --git a/libs/utils/tests/LruCache_test.cpp b/libutils/tests/LruCache_test.cpp
similarity index 100%
rename from libs/utils/tests/LruCache_test.cpp
rename to libutils/tests/LruCache_test.cpp
diff --git a/libs/utils/tests/String8_test.cpp b/libutils/tests/String8_test.cpp
similarity index 100%
rename from libs/utils/tests/String8_test.cpp
rename to libutils/tests/String8_test.cpp
diff --git a/libs/utils/tests/TestHelpers.h b/libutils/tests/TestHelpers.h
similarity index 100%
rename from libs/utils/tests/TestHelpers.h
rename to libutils/tests/TestHelpers.h
diff --git a/libs/utils/tests/Unicode_test.cpp b/libutils/tests/Unicode_test.cpp
similarity index 100%
rename from libs/utils/tests/Unicode_test.cpp
rename to libutils/tests/Unicode_test.cpp
diff --git a/libs/utils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp
similarity index 100%
rename from libs/utils/tests/Vector_test.cpp
rename to libutils/tests/Vector_test.cpp