diff --git a/amm-ui/qml/components/AddLiquidityForm.qml b/amm-ui/qml/components/liquidity/AddLiquidityForm.qml
similarity index 99%
rename from amm-ui/qml/components/AddLiquidityForm.qml
rename to amm-ui/qml/components/liquidity/AddLiquidityForm.qml
index 2a1de26..db8c59b 100644
--- a/amm-ui/qml/components/AddLiquidityForm.qml
+++ b/amm-ui/qml/components/liquidity/AddLiquidityForm.qml
@@ -1,7 +1,8 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import "../state"
+import "../shared"
+import "../../state"
 
 Rectangle {
     id: root
diff --git a/amm-ui/qml/components/EstimateInfoButton.qml b/amm-ui/qml/components/liquidity/EstimateInfoButton.qml
similarity index 100%
rename from amm-ui/qml/components/EstimateInfoButton.qml
rename to amm-ui/qml/components/liquidity/EstimateInfoButton.qml
diff --git a/amm-ui/qml/components/LiquidityActionTabs.qml b/amm-ui/qml/components/liquidity/LiquidityActionTabs.qml
similarity index 100%
rename from amm-ui/qml/components/LiquidityActionTabs.qml
rename to amm-ui/qml/components/liquidity/LiquidityActionTabs.qml
diff --git a/amm-ui/qml/components/LiquidityConfirmationDialog.qml b/amm-ui/qml/components/liquidity/LiquidityConfirmationDialog.qml
similarity index 100%
rename from amm-ui/qml/components/LiquidityConfirmationDialog.qml
rename to amm-ui/qml/components/liquidity/LiquidityConfirmationDialog.qml
diff --git a/amm-ui/qml/components/PoolPositionSummary.qml b/amm-ui/qml/components/liquidity/PoolPositionSummary.qml
similarity index 99%
rename from amm-ui/qml/components/PoolPositionSummary.qml
rename to amm-ui/qml/components/liquidity/PoolPositionSummary.qml
index 599aeba..2466ae7 100644
--- a/amm-ui/qml/components/PoolPositionSummary.qml
+++ b/amm-ui/qml/components/liquidity/PoolPositionSummary.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
-import "../state"
+import "../../state"
 
 Rectangle {
     id: root
diff --git a/amm-ui/qml/components/RemoveLiquidityForm.qml b/amm-ui/qml/components/liquidity/RemoveLiquidityForm.qml
similarity index 99%
rename from amm-ui/qml/components/RemoveLiquidityForm.qml
rename to amm-ui/qml/components/liquidity/RemoveLiquidityForm.qml
index 47fbbbf..b916a74 100644
--- a/amm-ui/qml/components/RemoveLiquidityForm.qml
+++ b/amm-ui/qml/components/liquidity/RemoveLiquidityForm.qml
@@ -1,7 +1,8 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import "../state"
+import "../shared"
+import "../../state"
 
 Rectangle {
     id: root
diff --git a/amm-ui/qml/components/SummaryRow.qml b/amm-ui/qml/components/liquidity/SummaryRow.qml
similarity index 100%
rename from amm-ui/qml/components/SummaryRow.qml
rename to amm-ui/qml/components/liquidity/SummaryRow.qml
diff --git a/amm-ui/qml/components/TokenAmountInput.qml b/amm-ui/qml/components/liquidity/TokenAmountInput.qml
similarity index 100%
rename from amm-ui/qml/components/TokenAmountInput.qml
rename to amm-ui/qml/components/liquidity/TokenAmountInput.qml
diff --git a/amm-ui/qml/components/SlippageToleranceControl.qml b/amm-ui/qml/components/shared/SlippageToleranceControl.qml
similarity index 100%
rename from amm-ui/qml/components/SlippageToleranceControl.qml
rename to amm-ui/qml/components/shared/SlippageToleranceControl.qml
diff --git a/amm-ui/qml/components/SuccessToast.qml b/amm-ui/qml/components/shared/SuccessToast.qml
similarity index 100%
rename from amm-ui/qml/components/SuccessToast.qml
rename to amm-ui/qml/components/shared/SuccessToast.qml
diff --git a/amm-ui/qml/components/swap/SwapCard.qml b/amm-ui/qml/components/swap/SwapCard.qml
index 36de0a6..5a3f601 100644
--- a/amm-ui/qml/components/swap/SwapCard.qml
+++ b/amm-ui/qml/components/swap/SwapCard.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import ".."
+import "../shared"
 import "../../state"
 
 Rectangle {
diff --git a/amm-ui/qml/pages/LiquidityPage.qml b/amm-ui/qml/pages/LiquidityPage.qml
index c2aa033..f471952 100644
--- a/amm-ui/qml/pages/LiquidityPage.qml
+++ b/amm-ui/qml/pages/LiquidityPage.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
-import "../components"
+import "../components/shared"
+import "../components/liquidity"
 import "../state"
 
 Item {
diff --git a/amm-ui/qml/pages/SwapPage.qml b/amm-ui/qml/pages/SwapPage.qml
index bddadcf..75b42d4 100644
--- a/amm-ui/qml/pages/SwapPage.qml
+++ b/amm-ui/qml/pages/SwapPage.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import "../components"
+import "../components/shared"
 import "../components/swap"
 import "../state"