diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/chromeos-bsp-lakitu-0.0.1-r32.ebuild b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1-r32.ebuild
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/chromeos-bsp-lakitu-0.0.1-r32.ebuild
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1-r32.ebuild
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/chromeos-bsp-lakitu-0.0.1.ebuild b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1.ebuild
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/chromeos-bsp-lakitu-0.0.1.ebuild
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/chromeos-bsp-lakitu-0.0.1.ebuild
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/crash-filter b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/crash-filter
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/crash-filter
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/crash-filter
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/editor.sh b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/editor.sh
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/editor.sh
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/editor.sh
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/fsck-log-to-serial-console.conf b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/fsck-log-to-serial-console.conf
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/fsck-log-to-serial-console.conf
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/fsck-log-to-serial-console.conf
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/networkd-no-timeout.conf b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/networkd-no-timeout.conf
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/networkd-no-timeout.conf
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/networkd-no-timeout.conf
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/nsswitch.conf b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/nsswitch.conf
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/nsswitch.conf
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/nsswitch.conf
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/os-release b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/os-release
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/os-release
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/os-release
diff --git a/project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/report-system-info.service b/project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/report-system-info.service
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-bsp-lakitu/files/report-system-info.service
rename to project-lakitu/chromeos-base/chromeos-bsp-lakitu-common/files/report-system-info.service