diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index 045b6042d..984b8553d 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -49,9 +49,6 @@ qt5_wrap_ui(ui_GasPricing.h GasPricing.ui)
 
 # Extensions
 qt5_wrap_ui(ui_AllAccounts.h AllAccounts.ui)
-qt5_wrap_ui(ui_LogPanel.h LogPanel.ui)
-qt5_wrap_ui(ui_BrainWallet.h BrainWallet.ui)
-qt5_wrap_ui(ui_OtherAccounts.h OtherAccounts.ui)
 
 file(GLOB HEADERS "*.h")
 
@@ -64,7 +61,7 @@ endif ()
 # eth_add_executable is defined in cmake/EthExecutableHelper.cmake
 eth_add_executable(${EXECUTABLE} 
 	ICON alethzero
-    UI_RESOURCES ${PLUGIN_UI} alethzero.icns Main.ui Connect.ui Debugger.ui Transact.ui ExportState.ui GetPassword.ui GasPricing.ui AllAccounts.ui LogPanel.ui BrainWallet.ui OtherAccounts.ui
+    UI_RESOURCES ${PLUGIN_UI} alethzero.icns Main.ui Connect.ui Debugger.ui Transact.ui ExportState.ui GetPassword.ui GasPricing.ui
 	WIN_RESOURCES alethzero.rc
 )
 
diff --git a/alethzero/AllAccounts.cpp b/alethzero/plugins/blockchain/AllAccounts.cpp
similarity index 100%
rename from alethzero/AllAccounts.cpp
rename to alethzero/plugins/blockchain/AllAccounts.cpp
diff --git a/alethzero/AllAccounts.h b/alethzero/plugins/blockchain/AllAccounts.h
similarity index 100%
rename from alethzero/AllAccounts.h
rename to alethzero/plugins/blockchain/AllAccounts.h
diff --git a/alethzero/AllAccounts.ui b/alethzero/plugins/blockchain/AllAccounts.ui
similarity index 100%
rename from alethzero/AllAccounts.ui
rename to alethzero/plugins/blockchain/AllAccounts.ui
diff --git a/alethzero/BrainWallet.cpp b/alethzero/plugins/brainwallet/BrainWallet.cpp
similarity index 100%
rename from alethzero/BrainWallet.cpp
rename to alethzero/plugins/brainwallet/BrainWallet.cpp
diff --git a/alethzero/BrainWallet.h b/alethzero/plugins/brainwallet/BrainWallet.h
similarity index 100%
rename from alethzero/BrainWallet.h
rename to alethzero/plugins/brainwallet/BrainWallet.h
diff --git a/alethzero/BrainWallet.ui b/alethzero/plugins/brainwallet/BrainWallet.ui
similarity index 100%
rename from alethzero/BrainWallet.ui
rename to alethzero/plugins/brainwallet/BrainWallet.ui
diff --git a/alethzero/LogPanel.cpp b/alethzero/plugins/log/LogPanel.cpp
similarity index 100%
rename from alethzero/LogPanel.cpp
rename to alethzero/plugins/log/LogPanel.cpp
diff --git a/alethzero/LogPanel.h b/alethzero/plugins/log/LogPanel.h
similarity index 100%
rename from alethzero/LogPanel.h
rename to alethzero/plugins/log/LogPanel.h
diff --git a/alethzero/LogPanel.ui b/alethzero/plugins/log/LogPanel.ui
similarity index 100%
rename from alethzero/LogPanel.ui
rename to alethzero/plugins/log/LogPanel.ui
diff --git a/alethzero/NameRegNamer.cpp b/alethzero/plugins/namers/NameRegNamer.cpp
similarity index 100%
rename from alethzero/NameRegNamer.cpp
rename to alethzero/plugins/namers/NameRegNamer.cpp
diff --git a/alethzero/NameRegNamer.h b/alethzero/plugins/namers/NameRegNamer.h
similarity index 100%
rename from alethzero/NameRegNamer.h
rename to alethzero/plugins/namers/NameRegNamer.h
diff --git a/alethzero/OtherAccounts.cpp b/alethzero/plugins/namers/OtherAccounts.cpp
similarity index 100%
rename from alethzero/OtherAccounts.cpp
rename to alethzero/plugins/namers/OtherAccounts.cpp
diff --git a/alethzero/OtherAccounts.h b/alethzero/plugins/namers/OtherAccounts.h
similarity index 100%
rename from alethzero/OtherAccounts.h
rename to alethzero/plugins/namers/OtherAccounts.h
diff --git a/alethzero/OtherAccounts.ui b/alethzero/plugins/namers/OtherAccounts.ui
similarity index 100%
rename from alethzero/OtherAccounts.ui
rename to alethzero/plugins/namers/OtherAccounts.ui
diff --git a/alethzero/OurAccounts.cpp b/alethzero/plugins/namers/OurAccounts.cpp
similarity index 100%
rename from alethzero/OurAccounts.cpp
rename to alethzero/plugins/namers/OurAccounts.cpp
diff --git a/alethzero/OurAccounts.h b/alethzero/plugins/namers/OurAccounts.h
similarity index 100%
rename from alethzero/OurAccounts.h
rename to alethzero/plugins/namers/OurAccounts.h