diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..05712d4
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2018 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.
+#
+
+
+LOCAL_PATH := $(call my-dir)
+WALLPAPER_PATH := ../WallpaperPicker2
+
+#
+# Build rule for ThemePicker app.
+#
+include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SDK_VERSION := system_current
+
+LOCAL_PACKAGE_NAME := ThemePicker
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_OVERRIDES_PACKAGES := WallpaperPicker2
+
+LOCAL_SRC_FILES := $(call all-java-files-under, $(WALLPAPER_PATH)/src) \
+    $(call all-java-files-under, src) \
+    $(call all-java-files-under, src_override)
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 
+
+LOCAL_MANIFEST_FILE := AndroidManifest.xml
+
+include $(BUILD_PACKAGE)
+
+
+# ==================================================
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100755
index 0000000..79d81d4
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wallpaper">
+
+  <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="28"/>
+
+</manifest>
diff --git a/src/com/android/theme/picker/ThemePickerActivity.java b/src/com/android/theme/picker/ThemePickerActivity.java
new file mode 100644
index 0000000..7817d99
--- /dev/null
+++ b/src/com/android/theme/picker/ThemePickerActivity.java
@@ -0,0 +1,7 @@
+package com.android.theme.picker;
+
+import com.android.wallpaper.picker.BaseActivity;
+
+//TODO(santie): implement
+public class ThemePickerActivity extends BaseActivity {
+}
diff --git a/src_override/com/android/wallpaper/config/Flags.java b/src_override/com/android/wallpaper/config/Flags.java
new file mode 100644
index 0000000..d35d88f
--- /dev/null
+++ b/src_override/com/android/wallpaper/config/Flags.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+package com.android.wallpaper.config;
+
+public class Flags extends BaseFlags {
+}
diff --git a/src_override/com/android/wallpaper/module/WallpapersInjector.java b/src_override/com/android/wallpaper/module/WallpapersInjector.java
new file mode 100755
index 0000000..67b07fd
--- /dev/null
+++ b/src_override/com/android/wallpaper/module/WallpapersInjector.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2018 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.
+ */
+package com.android.wallpaper.module;
+
+import android.content.Context;
+
+import com.android.wallpaper.model.CategoryProvider;
+import com.android.wallpaper.model.WallpaperInfo;
+import com.android.wallpaper.monitor.PerformanceMonitor;
+import com.android.wallpaper.picker.PreviewFragment;
+
+import androidx.fragment.app.Fragment;
+
+/**
+ * A concrete, real implementation of the dependency provider.
+ */
+public class WallpapersInjector extends BaseWallpaperInjector {
+    private CategoryProvider mCategoryProvider;
+    private UserEventLogger mUserEventLogger;
+    private WallpaperRotationRefresher mWallpaperRotationRefresher;
+    private PerformanceMonitor mPerformanceMonitor;
+
+    @Override
+    public synchronized CategoryProvider getCategoryProvider(Context context) {
+        if (mCategoryProvider == null) {
+            mCategoryProvider = new DefaultCategoryProvider(context.getApplicationContext());
+        }
+        return mCategoryProvider;
+    }
+
+    @Override
+    public synchronized UserEventLogger getUserEventLogger(Context context) {
+        if (mUserEventLogger == null) {
+            mUserEventLogger = new NoOpUserEventLogger();
+        }
+        return mUserEventLogger;
+    }
+
+    @Override
+    public synchronized WallpaperRotationRefresher getWallpaperRotationRefresher() {
+        if (mWallpaperRotationRefresher == null) {
+            mWallpaperRotationRefresher = new WallpaperRotationRefresher() {
+                @Override
+                public void refreshWallpaper(Context context, Listener listener) {
+                    // Not implemented
+                    listener.onError();
+                }
+            };
+        }
+        return mWallpaperRotationRefresher;
+    }
+
+    @Override
+    public Fragment getPreviewFragment(
+        WallpaperInfo wallpaperInfo,
+        int mode,
+        boolean testingModeEnabled) {
+        return PreviewFragment.newInstance(wallpaperInfo, mode, testingModeEnabled);
+    }
+
+    @Override
+    public synchronized PerformanceMonitor getPerformanceMonitor() {
+        if (mPerformanceMonitor == null) {
+            mPerformanceMonitor = new PerformanceMonitor() {
+                @Override
+                public void recordFullResPreviewLoadedMemorySnapshot() {
+                    // No Op
+                }
+            };
+        }
+        return mPerformanceMonitor;
+    }
+
+    @Override
+    public synchronized LoggingOptInStatusProvider getLoggingOptInStatusProvider(Context context) {
+        return null;
+    }
+}