diff --git a/src/main/java/sarsoo/fmframework/fx/FmFramework.java b/src/main/java/sarsoo/fmframework/fx/FmFramework.java
index 0ebdf1f..1ad2b58 100644
--- a/src/main/java/sarsoo/fmframework/fx/FmFramework.java
+++ b/src/main/java/sarsoo/fmframework/fx/FmFramework.java
@@ -5,7 +5,7 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import sarsoo.fmframework.fx.controller.ControllerMain;
+import sarsoo.fmframework.fx.controller.RootController;
 import sarsoo.fmframework.util.Reference;
 
 public class FmFramework extends Application {
@@ -13,14 +13,14 @@ public class FmFramework extends Application {
 	private static Stage stage;
 	private Scene rootScene;
 	
-	private static ControllerMain control;
+	private static RootController control;
 
 	@Override
 	public void start(Stage stage) throws Exception {
 		FmFramework.stage = stage;
 		Reference.setUserName("sarsoo");
 		
-		FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/main.fxml"));
+		FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/RootPane.fxml"));
 		
 //		Parent root = FXMLLoader.load(getClass().getResource("ui/main.fxml"));
 		Parent root = (Parent)loader.load();
@@ -31,7 +31,7 @@ public class FmFramework extends Application {
 //		scene.getStylesheets().add("styles/style.css");
 		
 		
-		control = (ControllerMain)loader.getController();
+		control = (RootController)loader.getController();
 //		(new Thread(new TagCaller())).start();
 		stage.setMinHeight(800);
 		stage.setMinWidth(960);
@@ -50,7 +50,7 @@ public class FmFramework extends Application {
 //		
 //	}
 	
-	public static ControllerMain getController() {
+	public static RootController getController() {
 		return control;
 	}
 
diff --git a/src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java b/src/main/java/sarsoo/fmframework/fx/chart/GenrePieChartTitledPane.java
similarity index 91%
rename from src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java
rename to src/main/java/sarsoo/fmframework/fx/chart/GenrePieChartTitledPane.java
index 3d768c8..3b2a891 100644
--- a/src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java
+++ b/src/main/java/sarsoo/fmframework/fx/chart/GenrePieChartTitledPane.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx;
+package sarsoo.fmframework.fx.chart;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -6,8 +6,6 @@ import java.util.ArrayList;
 import javafx.scene.chart.PieChart;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import sarsoo.fmframework.fx.chart.GenrePieChart;
-import sarsoo.fmframework.fx.chart.GenreTotalPieChart;
 
 public class GenrePieChartTitledPane extends TitledPane {
 
diff --git a/src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java b/src/main/java/sarsoo/fmframework/fx/chart/PieChartTitledPane.java
similarity index 94%
rename from src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java
rename to src/main/java/sarsoo/fmframework/fx/chart/PieChartTitledPane.java
index 5896878..5f2b208 100644
--- a/src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java
+++ b/src/main/java/sarsoo/fmframework/fx/chart/PieChartTitledPane.java
@@ -1,4 +1,4 @@
-package sarsoo.fmframework.fx;
+package sarsoo.fmframework.fx.chart;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import javafx.scene.chart.PieChart;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import sarsoo.fmframework.fx.chart.GenreTotalPieChart;
 
 public class PieChartTitledPane extends TitledPane {
 
diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java b/src/main/java/sarsoo/fmframework/fx/controller/RootController.java
similarity index 95%
rename from src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
rename to src/main/java/sarsoo/fmframework/fx/controller/RootController.java
index e021d2c..e0fa3bb 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/RootController.java
@@ -19,6 +19,8 @@ import javafx.stage.FileChooser;
 import sarsoo.fmframework.file.ListPersister;
 import sarsoo.fmframework.fm.FmUserNetwork;
 import sarsoo.fmframework.fx.TextAreaConsole;
+import sarsoo.fmframework.fx.chart.GenrePieChartTitledPane;
+import sarsoo.fmframework.fx.chart.PieChartTitledPane;
 import sarsoo.fmframework.fx.tab.AlbumTab;
 import sarsoo.fmframework.fx.tab.ArtistTab;
 import sarsoo.fmframework.fx.tab.ConsoleTab;
@@ -27,8 +29,6 @@ import sarsoo.fmframework.fx.tab.FMObjListTab;
 import sarsoo.fmframework.fx.tab.ScrobbleChartTab;
 import sarsoo.fmframework.fx.tab.TrackTab;
 import sarsoo.fmframework.fx.FmFramework;
-import sarsoo.fmframework.fx.GenrePieChartTitledPane;
-import sarsoo.fmframework.fx.PieChartTitledPane;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.music.Artist;
 import sarsoo.fmframework.music.Tag;
@@ -48,7 +48,7 @@ import javafx.application.Platform;
 
 import org.json.*;
 
-public class ControllerMain {
+public class RootController {
 
 	@FXML
 	public void initialize() {
diff --git a/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java b/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java
index 7245333..aca5df5 100644
--- a/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java
+++ b/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java
@@ -13,7 +13,7 @@ public class FMObjListEditTab extends Tab {
 
 		setText("List");
 
-		FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListPaneEdit.fxml"));
+		FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListEditPane.fxml"));
 
 		AnchorPane pane = (AnchorPane) loader.load();
 
@@ -40,7 +40,7 @@ public class FMObjListEditTab extends Tab {
 			setText("list");
 		}
 
-		FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListPaneEdit.fxml"));
+		FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListEditPane.fxml"));
 
 		AnchorPane pane = (AnchorPane) loader.load();
 
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListEditPane.fxml
similarity index 100%
rename from src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
rename to src/main/resources/sarsoo/fmframework/fx/ui/FMObjListEditPane.fxml
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/RootPane.fxml
similarity index 98%
rename from src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
rename to src/main/resources/sarsoo/fmframework/fx/ui/RootPane.fxml
index da40ad5..70c3af2 100644
--- a/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/RootPane.fxml
@@ -6,7 +6,7 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<BorderPane fx:id="borderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onKeyPressed="#handleKeyShortcut" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.ControllerMain">
+<BorderPane fx:id="borderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onKeyPressed="#handleKeyShortcut" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.RootController">
    <top>
       <MenuBar fx:id="menuBar" BorderPane.alignment="CENTER">
         <menus>