diff --git a/src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java b/src/main/java/sarsoo/fmframework/fx/AlbumTab.java
similarity index 91%
rename from src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java
rename to src/main/java/sarsoo/fmframework/fx/AlbumTab.java
index 030f5ea..9bb27ab 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/AlbumTab.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java b/src/main/java/sarsoo/fmframework/fx/ArtistTab.java
similarity index 91%
rename from src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java
rename to src/main/java/sarsoo/fmframework/fx/ArtistTab.java
index 3832cc7..81d4ee2 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/ArtistTab.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java b/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
similarity index 79%
rename from src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java
rename to src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
index bbb8f96..f2c9b11 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
@@ -1,7 +1,6 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import javafx.scene.control.Tab;
-import sarsoo.fmframework.fx.TextAreaConsole;
 
 public class ConsoleTab extends Tab{
 	
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java b/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
similarity index 93%
rename from src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java
rename to src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
index 086c4e0..696bcfa 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 import javafx.scene.control.*;
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java b/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
similarity index 93%
rename from src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java
rename to src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
index c05139e..cb98948 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 import javafx.scene.control.*;
diff --git a/src/main/java/sarsoo/fmframework/fx/pane/GenrePieChartTitledPane.java b/src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java
similarity index 97%
rename from src/main/java/sarsoo/fmframework/fx/pane/GenrePieChartTitledPane.java
rename to src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java
index 20ab99e..3d768c8 100644
--- a/src/main/java/sarsoo/fmframework/fx/pane/GenrePieChartTitledPane.java
+++ b/src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.pane;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/sarsoo/fmframework/fx/pane/PieChartTitledPane.java b/src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java
similarity index 97%
rename from src/main/java/sarsoo/fmframework/fx/pane/PieChartTitledPane.java
rename to src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java
index 42f1d13..5896878 100644
--- a/src/main/java/sarsoo/fmframework/fx/pane/PieChartTitledPane.java
+++ b/src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.pane;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java b/src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java
similarity index 92%
rename from src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java
rename to src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java
index a108eaf..21102d6 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java b/src/main/java/sarsoo/fmframework/fx/TrackTab.java
similarity index 91%
rename from src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java
rename to src/main/java/sarsoo/fmframework/fx/TrackTab.java
index 6477ed4..ac24ba1 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/TrackTab.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx.tab;
+package sarsoo.fmframework.fx;
 
 import java.io.IOException;
 
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
index 3fa680d..8c19df7 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
@@ -7,8 +7,8 @@ import java.util.Locale;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import sarsoo.fmframework.fm.FmNetwork;
+import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.ArtistTab;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Wiki;
 import sarsoo.fmframework.net.Key;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
index 3abf43d..c0c6b56 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
@@ -7,8 +7,8 @@ import java.util.Locale;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import sarsoo.fmframework.fm.FmNetwork;
+import sarsoo.fmframework.fx.FMObjListTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.FMObjListTab;
 import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.Wiki;
 import sarsoo.fmframework.net.Key;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
index ca8f002..ee618ce 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
@@ -18,17 +18,17 @@ import javafx.fxml.FXML;
 import javafx.stage.FileChooser;
 import sarsoo.fmframework.file.ListPersister;
 import sarsoo.fmframework.fm.FmUserNetwork;
+import sarsoo.fmframework.fx.AlbumTab;
+import sarsoo.fmframework.fx.ArtistTab;
+import sarsoo.fmframework.fx.ConsoleTab;
+import sarsoo.fmframework.fx.FMObjListEditTab;
 import sarsoo.fmframework.fx.TextAreaConsole;
-import sarsoo.fmframework.fx.pane.GenrePieChartTitledPane;
-import sarsoo.fmframework.fx.pane.PieChartTitledPane;
+import sarsoo.fmframework.fx.FMObjListTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.AlbumTab;
-import sarsoo.fmframework.fx.tab.ArtistTab;
-import sarsoo.fmframework.fx.tab.ConsoleTab;
-import sarsoo.fmframework.fx.tab.FMObjListEditTab;
-import sarsoo.fmframework.fx.tab.FMObjListTab;
-import sarsoo.fmframework.fx.tab.ScrobbleChartTab;
-import sarsoo.fmframework.fx.tab.TrackTab;
+import sarsoo.fmframework.fx.GenrePieChartTitledPane;
+import sarsoo.fmframework.fx.PieChartTitledPane;
+import sarsoo.fmframework.fx.ScrobbleChartTab;
+import sarsoo.fmframework.fx.TrackTab;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.Tag;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
index 7addae7..8c8fdf6 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
@@ -15,8 +15,8 @@ import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.input.MouseEvent;
 import sarsoo.fmframework.fm.FmUserNetwork;
+import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.ArtistTab;
 import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.FMObj;
 import sarsoo.fmframework.net.Key;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
index 5bab014..ad609ce 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
@@ -17,10 +17,10 @@ import javafx.scene.input.MouseEvent;
 import sarsoo.fmframework.file.ListPersister;
 import sarsoo.fmframework.fm.FmNetwork;
 import sarsoo.fmframework.fm.FmUserNetwork;
+import sarsoo.fmframework.fx.AlbumTab;
+import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.AlbumTab;
-import sarsoo.fmframework.fx.tab.ArtistTab;
-import sarsoo.fmframework.fx.tab.TrackTab;
+import sarsoo.fmframework.fx.TrackTab;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.FMObj;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
index 4354c6c..a57ae72 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
@@ -16,9 +16,9 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import sarsoo.fmframework.fm.FmNetwork;
 import sarsoo.fmframework.fm.FmUserNetwork;
+import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.ArtistTab;
-import sarsoo.fmframework.fx.tab.TrackTab;
+import sarsoo.fmframework.fx.TrackTab;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Wiki;
 import sarsoo.fmframework.net.Key;
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java
index 552bd65..0acb237 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java
@@ -7,9 +7,9 @@ import java.util.Locale;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import sarsoo.fmframework.fm.FmNetwork;
+import sarsoo.fmframework.fx.AlbumTab;
+import sarsoo.fmframework.fx.ArtistTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.tab.AlbumTab;
-import sarsoo.fmframework.fx.tab.ArtistTab;
 import sarsoo.fmframework.music.Track;
 import sarsoo.fmframework.music.Wiki;
 import sarsoo.fmframework.net.Key;