diff --git a/google/Android.mk b/google/Android.mk
deleted file mode 100644
index 20bfbaf..0000000
--- a/google/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# WARNING: Everything listed here will be built on ALL platforms,
-# including x86, the emulator, and the SDK.  Modules must be uniquely
-# named (liblights.panda), and must build everywhere, or limit themselves
-# to only building on ARM if they include assembly. Individual makefiles
-# are responsible for having their own logic, for fine-grained control.
-
-LOCAL_PATH := $(call my-dir)
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/google/GoogleAudio.mk b/prebuilt/common/sounds/GoogleAudio.mk
similarity index 98%
rename from google/GoogleAudio.mk
rename to prebuilt/common/sounds/GoogleAudio.mk
index 1f4d617..bc5e12a 100644
--- a/google/GoogleAudio.mk
+++ b/prebuilt/common/sounds/GoogleAudio.mk
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH := vendor/bliss/google
+LOCAL_PATH := vendor/bliss/prebuilt/common/sounds
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/alarms/A_real_hoot.ogg:system/media/audio/alarms/A_real_hoot.ogg \
diff --git a/google/alarms/A_real_hoot.ogg b/prebuilt/common/sounds/alarms/A_real_hoot.ogg
similarity index 100%
rename from google/alarms/A_real_hoot.ogg
rename to prebuilt/common/sounds/alarms/A_real_hoot.ogg
Binary files differ
diff --git a/google/alarms/Bright_morning.ogg b/prebuilt/common/sounds/alarms/Bright_morning.ogg
similarity index 100%
rename from google/alarms/Bright_morning.ogg
rename to prebuilt/common/sounds/alarms/Bright_morning.ogg
Binary files differ
diff --git a/google/alarms/Cuckoo_clock.ogg b/prebuilt/common/sounds/alarms/Cuckoo_clock.ogg
similarity index 100%
rename from google/alarms/Cuckoo_clock.ogg
rename to prebuilt/common/sounds/alarms/Cuckoo_clock.ogg
Binary files differ
diff --git a/google/alarms/Early_twilight.ogg b/prebuilt/common/sounds/alarms/Early_twilight.ogg
similarity index 100%
rename from google/alarms/Early_twilight.ogg
rename to prebuilt/common/sounds/alarms/Early_twilight.ogg
Binary files differ
diff --git a/google/alarms/Full_of_wonder.ogg b/prebuilt/common/sounds/alarms/Full_of_wonder.ogg
similarity index 100%
rename from google/alarms/Full_of_wonder.ogg
rename to prebuilt/common/sounds/alarms/Full_of_wonder.ogg
Binary files differ
diff --git a/google/alarms/Gentle_breeze.ogg b/prebuilt/common/sounds/alarms/Gentle_breeze.ogg
similarity index 100%
rename from google/alarms/Gentle_breeze.ogg
rename to prebuilt/common/sounds/alarms/Gentle_breeze.ogg
Binary files differ
diff --git a/google/alarms/Icicles.ogg b/prebuilt/common/sounds/alarms/Icicles.ogg
similarity index 100%
rename from google/alarms/Icicles.ogg
rename to prebuilt/common/sounds/alarms/Icicles.ogg
Binary files differ
diff --git a/google/alarms/Jump_start.ogg b/prebuilt/common/sounds/alarms/Jump_start.ogg
similarity index 100%
rename from google/alarms/Jump_start.ogg
rename to prebuilt/common/sounds/alarms/Jump_start.ogg
Binary files differ
diff --git a/google/alarms/Loose_change.ogg b/prebuilt/common/sounds/alarms/Loose_change.ogg
similarity index 100%
rename from google/alarms/Loose_change.ogg
rename to prebuilt/common/sounds/alarms/Loose_change.ogg
Binary files differ
diff --git a/google/alarms/Rolling_fog.ogg b/prebuilt/common/sounds/alarms/Rolling_fog.ogg
similarity index 100%
rename from google/alarms/Rolling_fog.ogg
rename to prebuilt/common/sounds/alarms/Rolling_fog.ogg
Binary files differ
diff --git a/google/alarms/Spokes.ogg b/prebuilt/common/sounds/alarms/Spokes.ogg
similarity index 100%
rename from google/alarms/Spokes.ogg
rename to prebuilt/common/sounds/alarms/Spokes.ogg
Binary files differ
diff --git a/google/alarms/Sunshower.ogg b/prebuilt/common/sounds/alarms/Sunshower.ogg
similarity index 100%
rename from google/alarms/Sunshower.ogg
rename to prebuilt/common/sounds/alarms/Sunshower.ogg
Binary files differ
diff --git a/google/effects/Dock.ogg b/prebuilt/common/sounds/effects/Dock.ogg
similarity index 100%
rename from google/effects/Dock.ogg
rename to prebuilt/common/sounds/effects/Dock.ogg
Binary files differ
diff --git a/google/effects/Effect_Tick.ogg b/prebuilt/common/sounds/effects/Effect_Tick.ogg
similarity index 100%
rename from google/effects/Effect_Tick.ogg
rename to prebuilt/common/sounds/effects/Effect_Tick.ogg
Binary files differ
diff --git a/google/effects/InCallNotification.ogg b/prebuilt/common/sounds/effects/InCallNotification.ogg
similarity index 100%
rename from google/effects/InCallNotification.ogg
rename to prebuilt/common/sounds/effects/InCallNotification.ogg
Binary files differ
diff --git a/google/effects/KeypressDelete.ogg b/prebuilt/common/sounds/effects/KeypressDelete.ogg
similarity index 100%
rename from google/effects/KeypressDelete.ogg
rename to prebuilt/common/sounds/effects/KeypressDelete.ogg
Binary files differ
diff --git a/google/effects/KeypressInvalid.ogg b/prebuilt/common/sounds/effects/KeypressInvalid.ogg
similarity index 100%
rename from google/effects/KeypressInvalid.ogg
rename to prebuilt/common/sounds/effects/KeypressInvalid.ogg
Binary files differ
diff --git a/google/effects/KeypressReturn.ogg b/prebuilt/common/sounds/effects/KeypressReturn.ogg
similarity index 100%
rename from google/effects/KeypressReturn.ogg
rename to prebuilt/common/sounds/effects/KeypressReturn.ogg
Binary files differ
diff --git a/google/effects/KeypressSpacebar.ogg b/prebuilt/common/sounds/effects/KeypressSpacebar.ogg
similarity index 100%
rename from google/effects/KeypressSpacebar.ogg
rename to prebuilt/common/sounds/effects/KeypressSpacebar.ogg
Binary files differ
diff --git a/google/effects/KeypressStandard.ogg b/prebuilt/common/sounds/effects/KeypressStandard.ogg
similarity index 100%
rename from google/effects/KeypressStandard.ogg
rename to prebuilt/common/sounds/effects/KeypressStandard.ogg
Binary files differ
diff --git a/google/effects/Lock.ogg b/prebuilt/common/sounds/effects/Lock.ogg
similarity index 100%
rename from google/effects/Lock.ogg
rename to prebuilt/common/sounds/effects/Lock.ogg
Binary files differ
diff --git a/google/effects/LowBattery.ogg b/prebuilt/common/sounds/effects/LowBattery.ogg
similarity index 100%
rename from google/effects/LowBattery.ogg
rename to prebuilt/common/sounds/effects/LowBattery.ogg
Binary files differ
diff --git a/google/effects/NFCFailure.ogg b/prebuilt/common/sounds/effects/NFCFailure.ogg
similarity index 100%
rename from google/effects/NFCFailure.ogg
rename to prebuilt/common/sounds/effects/NFCFailure.ogg
Binary files differ
diff --git a/google/effects/NFCInitiated.ogg b/prebuilt/common/sounds/effects/NFCInitiated.ogg
similarity index 100%
rename from google/effects/NFCInitiated.ogg
rename to prebuilt/common/sounds/effects/NFCInitiated.ogg
Binary files differ
diff --git a/google/effects/NFCSuccess.ogg b/prebuilt/common/sounds/effects/NFCSuccess.ogg
similarity index 100%
rename from google/effects/NFCSuccess.ogg
rename to prebuilt/common/sounds/effects/NFCSuccess.ogg
Binary files differ
diff --git a/google/effects/NFCTransferComplete.ogg b/prebuilt/common/sounds/effects/NFCTransferComplete.ogg
similarity index 100%
rename from google/effects/NFCTransferComplete.ogg
rename to prebuilt/common/sounds/effects/NFCTransferComplete.ogg
Binary files differ
diff --git a/google/effects/NFCTransferInitiated.ogg b/prebuilt/common/sounds/effects/NFCTransferInitiated.ogg
similarity index 100%
rename from google/effects/NFCTransferInitiated.ogg
rename to prebuilt/common/sounds/effects/NFCTransferInitiated.ogg
Binary files differ
diff --git a/google/effects/Trusted.ogg b/prebuilt/common/sounds/effects/Trusted.ogg
similarity index 100%
rename from google/effects/Trusted.ogg
rename to prebuilt/common/sounds/effects/Trusted.ogg
Binary files differ
diff --git a/google/effects/Undock.ogg b/prebuilt/common/sounds/effects/Undock.ogg
similarity index 100%
rename from google/effects/Undock.ogg
rename to prebuilt/common/sounds/effects/Undock.ogg
Binary files differ
diff --git a/google/effects/Unlock.ogg b/prebuilt/common/sounds/effects/Unlock.ogg
similarity index 100%
rename from google/effects/Unlock.ogg
rename to prebuilt/common/sounds/effects/Unlock.ogg
Binary files differ
diff --git a/google/effects/VideoRecord.ogg b/prebuilt/common/sounds/effects/VideoRecord.ogg
similarity index 100%
rename from google/effects/VideoRecord.ogg
rename to prebuilt/common/sounds/effects/VideoRecord.ogg
Binary files differ
diff --git a/google/effects/VideoStop.ogg b/prebuilt/common/sounds/effects/VideoStop.ogg
similarity index 100%
rename from google/effects/VideoStop.ogg
rename to prebuilt/common/sounds/effects/VideoStop.ogg
Binary files differ
diff --git a/google/effects/WirelessChargingStarted.ogg b/prebuilt/common/sounds/effects/WirelessChargingStarted.ogg
similarity index 100%
rename from google/effects/WirelessChargingStarted.ogg
rename to prebuilt/common/sounds/effects/WirelessChargingStarted.ogg
Binary files differ
diff --git a/google/effects/audio_end.ogg b/prebuilt/common/sounds/effects/audio_end.ogg
similarity index 100%
rename from google/effects/audio_end.ogg
rename to prebuilt/common/sounds/effects/audio_end.ogg
Binary files differ
diff --git a/google/effects/audio_initiate.ogg b/prebuilt/common/sounds/effects/audio_initiate.ogg
similarity index 100%
rename from google/effects/audio_initiate.ogg
rename to prebuilt/common/sounds/effects/audio_initiate.ogg
Binary files differ
diff --git a/google/effects/camera_click.ogg b/prebuilt/common/sounds/effects/camera_click.ogg
similarity index 100%
rename from google/effects/camera_click.ogg
rename to prebuilt/common/sounds/effects/camera_click.ogg
Binary files differ
diff --git a/google/effects/camera_focus.ogg b/prebuilt/common/sounds/effects/camera_focus.ogg
similarity index 100%
rename from google/effects/camera_focus.ogg
rename to prebuilt/common/sounds/effects/camera_focus.ogg
Binary files differ
diff --git a/google/notifications/Beginning.ogg b/prebuilt/common/sounds/notifications/Beginning.ogg
similarity index 100%
rename from google/notifications/Beginning.ogg
rename to prebuilt/common/sounds/notifications/Beginning.ogg
Binary files differ
diff --git a/google/notifications/Coconuts.ogg b/prebuilt/common/sounds/notifications/Coconuts.ogg
similarity index 100%
rename from google/notifications/Coconuts.ogg
rename to prebuilt/common/sounds/notifications/Coconuts.ogg
Binary files differ
diff --git a/google/notifications/Duet.ogg b/prebuilt/common/sounds/notifications/Duet.ogg
similarity index 100%
rename from google/notifications/Duet.ogg
rename to prebuilt/common/sounds/notifications/Duet.ogg
Binary files differ
diff --git a/google/notifications/End_note.ogg b/prebuilt/common/sounds/notifications/End_note.ogg
similarity index 100%
rename from google/notifications/End_note.ogg
rename to prebuilt/common/sounds/notifications/End_note.ogg
Binary files differ
diff --git a/google/notifications/Gentle_gong.ogg b/prebuilt/common/sounds/notifications/Gentle_gong.ogg
similarity index 100%
rename from google/notifications/Gentle_gong.ogg
rename to prebuilt/common/sounds/notifications/Gentle_gong.ogg
Binary files differ
diff --git a/google/notifications/Mallet.ogg b/prebuilt/common/sounds/notifications/Mallet.ogg
similarity index 100%
rename from google/notifications/Mallet.ogg
rename to prebuilt/common/sounds/notifications/Mallet.ogg
Binary files differ
diff --git a/google/notifications/Orders_up.ogg b/prebuilt/common/sounds/notifications/Orders_up.ogg
similarity index 100%
rename from google/notifications/Orders_up.ogg
rename to prebuilt/common/sounds/notifications/Orders_up.ogg
Binary files differ
diff --git a/google/notifications/Ping.ogg b/prebuilt/common/sounds/notifications/Ping.ogg
similarity index 100%
rename from google/notifications/Ping.ogg
rename to prebuilt/common/sounds/notifications/Ping.ogg
Binary files differ
diff --git a/google/notifications/Pipes.ogg b/prebuilt/common/sounds/notifications/Pipes.ogg
similarity index 100%
rename from google/notifications/Pipes.ogg
rename to prebuilt/common/sounds/notifications/Pipes.ogg
Binary files differ
diff --git a/google/notifications/Popcorn.ogg b/prebuilt/common/sounds/notifications/Popcorn.ogg
similarity index 100%
rename from google/notifications/Popcorn.ogg
rename to prebuilt/common/sounds/notifications/Popcorn.ogg
Binary files differ
diff --git a/google/notifications/Shopkeeper.ogg b/prebuilt/common/sounds/notifications/Shopkeeper.ogg
similarity index 100%
rename from google/notifications/Shopkeeper.ogg
rename to prebuilt/common/sounds/notifications/Shopkeeper.ogg
Binary files differ
diff --git a/google/notifications/Sticks_and_stones.ogg b/prebuilt/common/sounds/notifications/Sticks_and_stones.ogg
similarity index 100%
rename from google/notifications/Sticks_and_stones.ogg
rename to prebuilt/common/sounds/notifications/Sticks_and_stones.ogg
Binary files differ
diff --git a/google/notifications/Tuneup.ogg b/prebuilt/common/sounds/notifications/Tuneup.ogg
similarity index 100%
rename from google/notifications/Tuneup.ogg
rename to prebuilt/common/sounds/notifications/Tuneup.ogg
Binary files differ
diff --git a/google/notifications/Tweeter.ogg b/prebuilt/common/sounds/notifications/Tweeter.ogg
similarity index 100%
rename from google/notifications/Tweeter.ogg
rename to prebuilt/common/sounds/notifications/Tweeter.ogg
Binary files differ
diff --git a/google/notifications/Twinkle.ogg b/prebuilt/common/sounds/notifications/Twinkle.ogg
similarity index 100%
rename from google/notifications/Twinkle.ogg
rename to prebuilt/common/sounds/notifications/Twinkle.ogg
Binary files differ
diff --git a/google/ringtones/Copycat.ogg b/prebuilt/common/sounds/ringtones/Copycat.ogg
similarity index 100%
rename from google/ringtones/Copycat.ogg
rename to prebuilt/common/sounds/ringtones/Copycat.ogg
Binary files differ
diff --git a/google/ringtones/Crackle.ogg b/prebuilt/common/sounds/ringtones/Crackle.ogg
similarity index 100%
rename from google/ringtones/Crackle.ogg
rename to prebuilt/common/sounds/ringtones/Crackle.ogg
Binary files differ
diff --git a/google/ringtones/Flutterby.ogg b/prebuilt/common/sounds/ringtones/Flutterby.ogg
similarity index 100%
rename from google/ringtones/Flutterby.ogg
rename to prebuilt/common/sounds/ringtones/Flutterby.ogg
Binary files differ
diff --git a/google/ringtones/Hotline.ogg b/prebuilt/common/sounds/ringtones/Hotline.ogg
similarity index 100%
rename from google/ringtones/Hotline.ogg
rename to prebuilt/common/sounds/ringtones/Hotline.ogg
Binary files differ
diff --git a/google/ringtones/Leaps_and_bounds.ogg b/prebuilt/common/sounds/ringtones/Leaps_and_bounds.ogg
similarity index 100%
rename from google/ringtones/Leaps_and_bounds.ogg
rename to prebuilt/common/sounds/ringtones/Leaps_and_bounds.ogg
Binary files differ
diff --git a/google/ringtones/Lollipop.ogg b/prebuilt/common/sounds/ringtones/Lollipop.ogg
similarity index 100%
rename from google/ringtones/Lollipop.ogg
rename to prebuilt/common/sounds/ringtones/Lollipop.ogg
Binary files differ
diff --git a/google/ringtones/Lost_and_found.ogg b/prebuilt/common/sounds/ringtones/Lost_and_found.ogg
similarity index 100%
rename from google/ringtones/Lost_and_found.ogg
rename to prebuilt/common/sounds/ringtones/Lost_and_found.ogg
Binary files differ
diff --git a/google/ringtones/Mash_up.ogg b/prebuilt/common/sounds/ringtones/Mash_up.ogg
similarity index 100%
rename from google/ringtones/Mash_up.ogg
rename to prebuilt/common/sounds/ringtones/Mash_up.ogg
Binary files differ
diff --git a/google/ringtones/Monkey_around.ogg b/prebuilt/common/sounds/ringtones/Monkey_around.ogg
similarity index 100%
rename from google/ringtones/Monkey_around.ogg
rename to prebuilt/common/sounds/ringtones/Monkey_around.ogg
Binary files differ
diff --git a/google/ringtones/Schools_out.ogg b/prebuilt/common/sounds/ringtones/Schools_out.ogg
similarity index 100%
rename from google/ringtones/Schools_out.ogg
rename to prebuilt/common/sounds/ringtones/Schools_out.ogg
Binary files differ
diff --git a/google/ringtones/The_big_adventure.ogg b/prebuilt/common/sounds/ringtones/The_big_adventure.ogg
similarity index 100%
rename from google/ringtones/The_big_adventure.ogg
rename to prebuilt/common/sounds/ringtones/The_big_adventure.ogg
Binary files differ
diff --git a/google/ringtones/Zen_too.ogg b/prebuilt/common/sounds/ringtones/Zen_too.ogg
similarity index 100%
rename from google/ringtones/Zen_too.ogg
rename to prebuilt/common/sounds/ringtones/Zen_too.ogg
Binary files differ
diff --git a/google/themes/Amber/Android.mk b/themes/Amber/Android.mk
similarity index 100%
rename from google/themes/Amber/Android.mk
rename to themes/Amber/Android.mk
diff --git a/google/themes/Amber/AndroidManifest.xml b/themes/Amber/AndroidManifest.xml
similarity index 100%
rename from google/themes/Amber/AndroidManifest.xml
rename to themes/Amber/AndroidManifest.xml
diff --git a/google/themes/Amber/res/values/colors.xml b/themes/Amber/res/values/colors.xml
similarity index 100%
rename from google/themes/Amber/res/values/colors.xml
rename to themes/Amber/res/values/colors.xml
diff --git a/google/themes/Android.mk b/themes/Android.mk
similarity index 100%
rename from google/themes/Android.mk
rename to themes/Android.mk
diff --git a/google/themes/Bl4ckAndYell0/Android.mk b/themes/Bl4ckAndYell0/Android.mk
similarity index 100%
rename from google/themes/Bl4ckAndYell0/Android.mk
rename to themes/Bl4ckAndYell0/Android.mk
diff --git a/google/themes/Bl4ckAndYell0/AndroidManifest.xml b/themes/Bl4ckAndYell0/AndroidManifest.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/AndroidManifest.xml
rename to themes/Bl4ckAndYell0/AndroidManifest.xml
diff --git a/google/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml b/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/res/color/ripple_material_light.xml
rename to themes/Bl4ckAndYell0/res/color/ripple_material_light.xml
diff --git a/google/themes/Bl4ckAndYell0/res/values/colors.xml b/themes/Bl4ckAndYell0/res/values/colors.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/res/values/colors.xml
rename to themes/Bl4ckAndYell0/res/values/colors.xml
diff --git a/google/themes/Bl4ckAndYell0/res/values/settings.xml b/themes/Bl4ckAndYell0/res/values/settings.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/res/values/settings.xml
rename to themes/Bl4ckAndYell0/res/values/settings.xml
diff --git a/google/themes/Bl4ckAndYell0/res/values/strings.xml b/themes/Bl4ckAndYell0/res/values/strings.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/res/values/strings.xml
rename to themes/Bl4ckAndYell0/res/values/strings.xml
diff --git a/google/themes/Bl4ckAndYell0/res/values/styles.xml b/themes/Bl4ckAndYell0/res/values/styles.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/res/values/styles.xml
rename to themes/Bl4ckAndYell0/res/values/styles.xml
diff --git a/google/themes/Bl4ckAndYell0/res/values/themes.xml b/themes/Bl4ckAndYell0/res/values/themes.xml
similarity index 100%
rename from google/themes/Bl4ckAndYell0/res/values/themes.xml
rename to themes/Bl4ckAndYell0/res/values/themes.xml
diff --git a/google/themes/BlackBliss/Android.mk b/themes/BlackBliss/Android.mk
similarity index 100%
rename from google/themes/BlackBliss/Android.mk
rename to themes/BlackBliss/Android.mk
diff --git a/google/themes/BlackBliss/AndroidManifest.xml b/themes/BlackBliss/AndroidManifest.xml
similarity index 100%
rename from google/themes/BlackBliss/AndroidManifest.xml
rename to themes/BlackBliss/AndroidManifest.xml
diff --git a/google/themes/BlackBliss/res/color/ripple_material_light.xml b/themes/BlackBliss/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/BlackBliss/res/color/ripple_material_light.xml
rename to themes/BlackBliss/res/color/ripple_material_light.xml
diff --git a/google/themes/BlackBliss/res/values/colors.xml b/themes/BlackBliss/res/values/colors.xml
similarity index 100%
rename from google/themes/BlackBliss/res/values/colors.xml
rename to themes/BlackBliss/res/values/colors.xml
diff --git a/google/themes/BlackBliss/res/values/settings.xml b/themes/BlackBliss/res/values/settings.xml
similarity index 100%
rename from google/themes/BlackBliss/res/values/settings.xml
rename to themes/BlackBliss/res/values/settings.xml
diff --git a/google/themes/BlackBliss/res/values/strings.xml b/themes/BlackBliss/res/values/strings.xml
similarity index 100%
rename from google/themes/BlackBliss/res/values/strings.xml
rename to themes/BlackBliss/res/values/strings.xml
diff --git a/google/themes/BlackBliss/res/values/styles.xml b/themes/BlackBliss/res/values/styles.xml
similarity index 100%
rename from google/themes/BlackBliss/res/values/styles.xml
rename to themes/BlackBliss/res/values/styles.xml
diff --git a/google/themes/BlackBliss/res/values/themes.xml b/themes/BlackBliss/res/values/themes.xml
similarity index 100%
rename from google/themes/BlackBliss/res/values/themes.xml
rename to themes/BlackBliss/res/values/themes.xml
diff --git a/google/themes/DarkBliss/Android.mk b/themes/DarkBliss/Android.mk
similarity index 100%
rename from google/themes/DarkBliss/Android.mk
rename to themes/DarkBliss/Android.mk
diff --git a/google/themes/DarkBliss/AndroidManifest.xml b/themes/DarkBliss/AndroidManifest.xml
similarity index 100%
rename from google/themes/DarkBliss/AndroidManifest.xml
rename to themes/DarkBliss/AndroidManifest.xml
diff --git a/google/themes/DarkBliss/res/color/ripple_material_light.xml b/themes/DarkBliss/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/DarkBliss/res/color/ripple_material_light.xml
rename to themes/DarkBliss/res/color/ripple_material_light.xml
diff --git a/google/themes/DarkBliss/res/values/colors.xml b/themes/DarkBliss/res/values/colors.xml
similarity index 100%
rename from google/themes/DarkBliss/res/values/colors.xml
rename to themes/DarkBliss/res/values/colors.xml
diff --git a/google/themes/DarkBliss/res/values/settings.xml b/themes/DarkBliss/res/values/settings.xml
similarity index 100%
rename from google/themes/DarkBliss/res/values/settings.xml
rename to themes/DarkBliss/res/values/settings.xml
diff --git a/google/themes/DarkBliss/res/values/strings.xml b/themes/DarkBliss/res/values/strings.xml
similarity index 100%
rename from google/themes/DarkBliss/res/values/strings.xml
rename to themes/DarkBliss/res/values/strings.xml
diff --git a/google/themes/DarkBliss/res/values/styles.xml b/themes/DarkBliss/res/values/styles.xml
similarity index 100%
rename from google/themes/DarkBliss/res/values/styles.xml
rename to themes/DarkBliss/res/values/styles.xml
diff --git a/google/themes/DarkBliss/res/values/themes.xml b/themes/DarkBliss/res/values/themes.xml
similarity index 100%
rename from google/themes/DarkBliss/res/values/themes.xml
rename to themes/DarkBliss/res/values/themes.xml
diff --git a/google/themes/DarknessMeister/Android.mk b/themes/DarknessMeister/Android.mk
similarity index 100%
rename from google/themes/DarknessMeister/Android.mk
rename to themes/DarknessMeister/Android.mk
diff --git a/google/themes/DarknessMeister/AndroidManifest.xml b/themes/DarknessMeister/AndroidManifest.xml
similarity index 100%
rename from google/themes/DarknessMeister/AndroidManifest.xml
rename to themes/DarknessMeister/AndroidManifest.xml
diff --git a/google/themes/DarknessMeister/res/color/ripple_material_light.xml b/themes/DarknessMeister/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/DarknessMeister/res/color/ripple_material_light.xml
rename to themes/DarknessMeister/res/color/ripple_material_light.xml
diff --git a/google/themes/DarknessMeister/res/values/colors.xml b/themes/DarknessMeister/res/values/colors.xml
similarity index 100%
rename from google/themes/DarknessMeister/res/values/colors.xml
rename to themes/DarknessMeister/res/values/colors.xml
diff --git a/google/themes/DarknessMeister/res/values/settings.xml b/themes/DarknessMeister/res/values/settings.xml
similarity index 100%
rename from google/themes/DarknessMeister/res/values/settings.xml
rename to themes/DarknessMeister/res/values/settings.xml
diff --git a/google/themes/DarknessMeister/res/values/strings.xml b/themes/DarknessMeister/res/values/strings.xml
similarity index 100%
rename from google/themes/DarknessMeister/res/values/strings.xml
rename to themes/DarknessMeister/res/values/strings.xml
diff --git a/google/themes/DarknessMeister/res/values/styles.xml b/themes/DarknessMeister/res/values/styles.xml
similarity index 100%
rename from google/themes/DarknessMeister/res/values/styles.xml
rename to themes/DarknessMeister/res/values/styles.xml
diff --git a/google/themes/DarknessMeister/res/values/themes.xml b/themes/DarknessMeister/res/values/themes.xml
similarity index 100%
rename from google/themes/DarknessMeister/res/values/themes.xml
rename to themes/DarknessMeister/res/values/themes.xml
diff --git a/google/themes/GboardDarkTheme/Android.mk b/themes/GboardDarkTheme/Android.mk
similarity index 100%
rename from google/themes/GboardDarkTheme/Android.mk
rename to themes/GboardDarkTheme/Android.mk
diff --git a/google/themes/GboardDarkTheme/AndroidManifest.xml b/themes/GboardDarkTheme/AndroidManifest.xml
similarity index 100%
rename from google/themes/GboardDarkTheme/AndroidManifest.xml
rename to themes/GboardDarkTheme/AndroidManifest.xml
diff --git a/google/themes/GboardDarkTheme/res/values-v21/colors.xml b/themes/GboardDarkTheme/res/values-v21/colors.xml
similarity index 100%
rename from google/themes/GboardDarkTheme/res/values-v21/colors.xml
rename to themes/GboardDarkTheme/res/values-v21/colors.xml
diff --git a/google/themes/GboardDarkTheme/res/values/colors.xml b/themes/GboardDarkTheme/res/values/colors.xml
similarity index 100%
rename from google/themes/GboardDarkTheme/res/values/colors.xml
rename to themes/GboardDarkTheme/res/values/colors.xml
diff --git a/google/themes/GboardDarkTheme/res/values/strings.xml b/themes/GboardDarkTheme/res/values/strings.xml
similarity index 100%
rename from google/themes/GboardDarkTheme/res/values/strings.xml
rename to themes/GboardDarkTheme/res/values/strings.xml
diff --git a/google/themes/Pixel/Android.mk b/themes/Pixel/Android.mk
similarity index 100%
rename from google/themes/Pixel/Android.mk
rename to themes/Pixel/Android.mk
diff --git a/google/themes/Pixel/AndroidManifest.xml b/themes/Pixel/AndroidManifest.xml
similarity index 100%
rename from google/themes/Pixel/AndroidManifest.xml
rename to themes/Pixel/AndroidManifest.xml
diff --git a/google/themes/Pixel/res/values/colors.xml b/themes/Pixel/res/values/colors.xml
similarity index 100%
rename from google/themes/Pixel/res/values/colors.xml
rename to themes/Pixel/res/values/colors.xml
diff --git a/google/themes/SluttyPink/Android.mk b/themes/SluttyPink/Android.mk
similarity index 100%
rename from google/themes/SluttyPink/Android.mk
rename to themes/SluttyPink/Android.mk
diff --git a/google/themes/SluttyPink/AndroidManifest.xml b/themes/SluttyPink/AndroidManifest.xml
similarity index 100%
rename from google/themes/SluttyPink/AndroidManifest.xml
rename to themes/SluttyPink/AndroidManifest.xml
diff --git a/google/themes/SluttyPink/res/color/ripple_material_light.xml b/themes/SluttyPink/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/SluttyPink/res/color/ripple_material_light.xml
rename to themes/SluttyPink/res/color/ripple_material_light.xml
diff --git a/google/themes/SluttyPink/res/values/colors.xml b/themes/SluttyPink/res/values/colors.xml
similarity index 100%
rename from google/themes/SluttyPink/res/values/colors.xml
rename to themes/SluttyPink/res/values/colors.xml
diff --git a/google/themes/SluttyPink/res/values/settings.xml b/themes/SluttyPink/res/values/settings.xml
similarity index 100%
rename from google/themes/SluttyPink/res/values/settings.xml
rename to themes/SluttyPink/res/values/settings.xml
diff --git a/google/themes/SluttyPink/res/values/strings.xml b/themes/SluttyPink/res/values/strings.xml
similarity index 100%
rename from google/themes/SluttyPink/res/values/strings.xml
rename to themes/SluttyPink/res/values/strings.xml
diff --git a/google/themes/SluttyPink/res/values/styles.xml b/themes/SluttyPink/res/values/styles.xml
similarity index 100%
rename from google/themes/SluttyPink/res/values/styles.xml
rename to themes/SluttyPink/res/values/styles.xml
diff --git a/google/themes/SluttyPink/res/values/themes.xml b/themes/SluttyPink/res/values/themes.xml
similarity index 100%
rename from google/themes/SluttyPink/res/values/themes.xml
rename to themes/SluttyPink/res/values/themes.xml
diff --git a/google/themes/SmokedGreen/Android.mk b/themes/SmokedGreen/Android.mk
similarity index 100%
rename from google/themes/SmokedGreen/Android.mk
rename to themes/SmokedGreen/Android.mk
diff --git a/google/themes/SmokedGreen/AndroidManifest.xml b/themes/SmokedGreen/AndroidManifest.xml
similarity index 100%
rename from google/themes/SmokedGreen/AndroidManifest.xml
rename to themes/SmokedGreen/AndroidManifest.xml
diff --git a/google/themes/SmokedGreen/res/color/ripple_material_light.xml b/themes/SmokedGreen/res/color/ripple_material_light.xml
similarity index 100%
rename from google/themes/SmokedGreen/res/color/ripple_material_light.xml
rename to themes/SmokedGreen/res/color/ripple_material_light.xml
diff --git a/google/themes/SmokedGreen/res/values/colors.xml b/themes/SmokedGreen/res/values/colors.xml
similarity index 100%
rename from google/themes/SmokedGreen/res/values/colors.xml
rename to themes/SmokedGreen/res/values/colors.xml
diff --git a/google/themes/SmokedGreen/res/values/settings.xml b/themes/SmokedGreen/res/values/settings.xml
similarity index 100%
rename from google/themes/SmokedGreen/res/values/settings.xml
rename to themes/SmokedGreen/res/values/settings.xml
diff --git a/google/themes/SmokedGreen/res/values/strings.xml b/themes/SmokedGreen/res/values/strings.xml
similarity index 100%
rename from google/themes/SmokedGreen/res/values/strings.xml
rename to themes/SmokedGreen/res/values/strings.xml
diff --git a/google/themes/SmokedGreen/res/values/styles.xml b/themes/SmokedGreen/res/values/styles.xml
similarity index 100%
rename from google/themes/SmokedGreen/res/values/styles.xml
rename to themes/SmokedGreen/res/values/styles.xml
diff --git a/google/themes/SmokedGreen/res/values/themes.xml b/themes/SmokedGreen/res/values/themes.xml
similarity index 100%
rename from google/themes/SmokedGreen/res/values/themes.xml
rename to themes/SmokedGreen/res/values/themes.xml
diff --git a/google/themes/Stock/Android.mk b/themes/Stock/Android.mk
similarity index 100%
rename from google/themes/Stock/Android.mk
rename to themes/Stock/Android.mk
diff --git a/google/themes/Stock/AndroidManifest.xml b/themes/Stock/AndroidManifest.xml
similarity index 100%
rename from google/themes/Stock/AndroidManifest.xml
rename to themes/Stock/AndroidManifest.xml
diff --git a/google/themes/Stock/res/values/colors.xml b/themes/Stock/res/values/colors.xml
similarity index 100%
rename from google/themes/Stock/res/values/colors.xml
rename to themes/Stock/res/values/colors.xml