diff --git a/.gitignore b/.gitignore
index 8de7cf2..b21cc75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,4 +71,13 @@ local.properties
 .cproject
  
 # PDT-specific
-.buildpath
\ No newline at end of file
+.buildpath
+
+.gradle
+/build/
+/buildSrc/build
+/buildSrc/subprojects/*/build
+/subprojects/*/build
+/subprojects/docs/src/samples/*/*/build
+/subprojects/internal-android-performance-testing/build-android-libs
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..aead3cb
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,44 @@
+/*
+ * This build file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a commented-out sample Java project to get you started.
+ * For more details take a look at the Java Quickstart chapter in the Gradle
+ * user guide available at https://docs.gradle.org/4.3/userguide/tutorial_java_projects.html
+ */
+
+
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
+apply plugin: 'application'
+apply plugin: 'eclipse'
+
+mainClassName = 'sarsoo.fmframework.fx.FmFramework'
+
+// In this section you declare where to find the dependencies of your project
+repositories {
+    // Use 'jcenter' for resolving your dependencies.
+    // You can declare any Maven/Ivy/file repository here.
+    mavenCentral()
+}
+
+// In this section you declare the dependencies for your production and test code
+dependencies {
+    // The production code uses the SLF4J logging API at compile time
+    compile 'org.slf4j:slf4j-api:1.7.25'
+
+    // Declare the dependency for your favourite test framework you want to use in your tests.
+    // TestNG is also supported by the Gradle Test task. Just change the
+    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
+    // 'test.useTestNG()' to your build script.
+    testCompile 'junit:junit:4.12'
+}
+
+jar {
+	manifest {
+        attributes 'Implementation-Title': 'fmframework',
+                   'Implementation-Version': '0.1.0',
+                   'Main-Class': 'sarsoo.fmframework.fx.FmFramework'
+    }
+    baseName = 'fmframework'
+    version =  '0.1.0'
+}
diff --git a/fmframework/.gitignore b/fmframework/.gitignore
deleted file mode 100644
index 591c73f..0000000
--- a/fmframework/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.project
-/bin/
-/doc/
diff --git a/fmframework/src/sarsoo/fmframework/test/AlbumTest.java b/fmframework/src/sarsoo/fmframework/test/AlbumTest.java
deleted file mode 100644
index e03ce59..0000000
--- a/fmframework/src/sarsoo/fmframework/test/AlbumTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package sarsoo.fmframework.test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-
-import sarsoo.fmframework.music.Album;
-
-class AlbumTest {
-
-	@Test
-	void testGetName() {
-		Album album = Album.getAlbum("Recovery", "Eminem", "sarsoo");
-		assertEquals(album.getName(), "Recovery");
-	}
-	
-	@Test
-	void testGetArtist() {
-		Album album = Album.getAlbum("Recovery", "Eminem", "sarsoo");
-		assertEquals(album.getArtist().getName(), "Eminem");
-	}
-	
-	@Test
-	void testListeners() {
-		Album album = Album.getAlbum("Recovery", "Eminem", "sarsoo");
-		assertNotNull(album.getListeners());
-	}
-	
-
-}
diff --git a/fmframework/src/sarsoo/fmframework/test/NetworkTest.java b/fmframework/src/sarsoo/fmframework/test/NetworkTest.java
deleted file mode 100644
index a787080..0000000
--- a/fmframework/src/sarsoo/fmframework/test/NetworkTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package sarsoo.fmframework.test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.InputStream;
-import java.time.Instant;
-import java.util.ArrayList;
-
-import org.junit.jupiter.api.Test;
-import org.w3c.dom.Document;
-
-import sarsoo.fmframework.music.Album;
-import sarsoo.fmframework.music.Artist;
-import sarsoo.fmframework.music.Tag;
-import sarsoo.fmframework.music.Track;
-import sarsoo.fmframework.net.Network;
-import sarsoo.fmframework.net.TestCall;
-import sarsoo.fmframework.net.URLBuilder;
-import sarsoo.fmframework.parser.AlbumParser;
-import sarsoo.fmframework.parser.Parser;
-import sarsoo.fmframework.util.FMObjList;
-import sarsoo.fmframework.util.Getter;
-import sarsoo.fmframework.util.Maths;
-import sarsoo.fmframework.util.Reference;
-
-class NetworkTest {
-//
-//	@Test
-//	void testCall() {
-//		//TestCall.test("Pink Floyd", "The Wall", "sarsoo");
-//	}
-//	
-//	@Test
-//	void test() {
-//		String url = URLBuilder.getAlbumInfoUrl("The Wall", "Pink Floyd", "Sarsoo");
-//		Document response = Network.getResponse(url);
-//		Album album = Parser.parseAlbum(response);
-//		//System.out.println(album);
-//	}
-//	
-//	@Test
-//	void testArtist() {
-//		String url = URLBuilder.getArtistInfoUrl("Pink Floyd", "sarsoo");
-//		Document response = Network.getResponse(url);
-//		Artist artist = Parser.parseArtist(response);
-//		//System.out.println(album);
-//	}
-//	
-//	@Test
-//	void testTrack() {
-//		String url = URLBuilder.getTrackInfoUrl("Business", "Eminem", "sarsoo");
-//		Document response = Network.getResponse(url);
-//		Track track = Parser.parseTrack(response);
-//		//System.out.println(album);
-//	}
-	
-	@Test
-	void testTag() {
-
-//		System.out.println(Instant.parse("2018-04-05T07:00:00.00Z").getEpochSecond());
-		Reference.setUserName("sarsoo");
-		Getter.getArtistTracks("eminem", "sarsoo");
-		
-//		System.out.println(url);
-	}
-	
-//	@Test
-//	void getArtistXml() {
-//		//String url = Network.getAlbumInfoUrl("The Wall", "Pink Floyd", "Sarsoo");
-//		//TestCall.test(url);
-//	}
-}
diff --git a/fmframework/src/sarsoo/fmframework/test/ParserTest.java b/fmframework/src/sarsoo/fmframework/test/ParserTest.java
deleted file mode 100644
index 1790367..0000000
--- a/fmframework/src/sarsoo/fmframework/test/ParserTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package sarsoo.fmframework.test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-import org.w3c.dom.Document;
-
-import sarsoo.fmframework.music.Album;
-import sarsoo.fmframework.net.Network;
-import sarsoo.fmframework.net.URLBuilder;
-import sarsoo.fmframework.parser.AlbumParser;
-
-class ParserTest {
-
-	@Test
-	void testParseAlbum() {
-		String url = URLBuilder.getAlbumInfoUrl("Pink Floyd", "The Wall", "sarsoo");
-		Document doc = Network.getResponse(url);
-		Album album = AlbumParser.parseAlbum(doc);
-		assertNotNull(album);
-	}
-	
-	@Test
-	void testParseArtist() {
-		String url = URLBuilder.getArtistInfoUrl("Pink Floyd", "sarsoo");
-		Document doc = Network.getResponse(url);
-		System.out.println();
-	}
-
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..4c637cc
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..d5779e8
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,18 @@
+/*
+ * This settings file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/4.3/userguide/multi_project_builds.html
+ */
+
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+
+rootProject.name = 'fmframework'
diff --git a/fmframework/src/.gitignore b/src/.gitignore
similarity index 100%
rename from fmframework/src/.gitignore
rename to src/.gitignore
diff --git a/fmframework/src/sarsoo/fmframework/error/ApiCallException.java b/src/main/java/sarsoo/fmframework/error/ApiCallException.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/error/ApiCallException.java
rename to src/main/java/sarsoo/fmframework/error/ApiCallException.java
diff --git a/fmframework/src/sarsoo/fmframework/file/ListPersister.java b/src/main/java/sarsoo/fmframework/file/ListPersister.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/file/ListPersister.java
rename to src/main/java/sarsoo/fmframework/file/ListPersister.java
diff --git a/fmframework/src/sarsoo/fmframework/file/Persister.java b/src/main/java/sarsoo/fmframework/file/Persister.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/file/Persister.java
rename to src/main/java/sarsoo/fmframework/file/Persister.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/AlbumTab.java b/src/main/java/sarsoo/fmframework/fx/AlbumTab.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/AlbumTab.java
rename to src/main/java/sarsoo/fmframework/fx/AlbumTab.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/ArtistTab.java b/src/main/java/sarsoo/fmframework/fx/ArtistTab.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ArtistTab.java
rename to src/main/java/sarsoo/fmframework/fx/ArtistTab.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/ConsoleTab.java b/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ConsoleTab.java
rename to src/main/java/sarsoo/fmframework/fx/ConsoleTab.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/FMObjListEditTab.java b/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/FMObjListEditTab.java
rename to src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/FMObjListTab.java b/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/FMObjListTab.java
rename to src/main/java/sarsoo/fmframework/fx/FMObjListTab.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/FmFramework.java b/src/main/java/sarsoo/fmframework/fx/FmFramework.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/FmFramework.java
rename to src/main/java/sarsoo/fmframework/fx/FmFramework.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/TagCaller.java b/src/main/java/sarsoo/fmframework/fx/TagCaller.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/TagCaller.java
rename to src/main/java/sarsoo/fmframework/fx/TagCaller.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/TextAreaConsole.java b/src/main/java/sarsoo/fmframework/fx/TextAreaConsole.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/TextAreaConsole.java
rename to src/main/java/sarsoo/fmframework/fx/TextAreaConsole.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/TrackTab.java b/src/main/java/sarsoo/fmframework/fx/TrackTab.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/TrackTab.java
rename to src/main/java/sarsoo/fmframework/fx/TrackTab.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
rename to src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/AlbumPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/AlbumPaneController.java
rename to src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/ArtistPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/ArtistPaneController.java
rename to src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/ControllerMain.java b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/ControllerMain.java
rename to src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/FMObjListPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
rename to src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
rename to src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/TrackPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/controller/TrackPaneController.java
rename to src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java
diff --git a/fmframework/src/sarsoo/fmframework/fx/styles/FMObjListPane.css b/src/main/java/sarsoo/fmframework/fx/styles/FMObjListPane.css
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/styles/FMObjListPane.css
rename to src/main/java/sarsoo/fmframework/fx/styles/FMObjListPane.css
diff --git a/fmframework/src/sarsoo/fmframework/fx/styles/ObjPane.css b/src/main/java/sarsoo/fmframework/fx/styles/ObjPane.css
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/styles/ObjPane.css
rename to src/main/java/sarsoo/fmframework/fx/styles/ObjPane.css
diff --git a/fmframework/src/sarsoo/fmframework/fx/styles/mainPane.css b/src/main/java/sarsoo/fmframework/fx/styles/mainPane.css
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/styles/mainPane.css
rename to src/main/java/sarsoo/fmframework/fx/styles/mainPane.css
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/AlbumPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/AlbumPane.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/AlbumPane.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/AlbumPane.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/ArtistPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/ArtistPane.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/ArtistPane.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/ArtistPane.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/FMObjListPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml b/src/main/java/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/TrackPane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/TrackPane.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/TrackPane.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/TrackPane.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/albumgetpane.fxml b/src/main/java/sarsoo/fmframework/fx/ui/albumgetpane.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/albumgetpane.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/albumgetpane.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/main.fxml b/src/main/java/sarsoo/fmframework/fx/ui/main.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/main.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/main.fxml
diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/template.fxml b/src/main/java/sarsoo/fmframework/fx/ui/template.fxml
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/fx/ui/template.fxml
rename to src/main/java/sarsoo/fmframework/fx/ui/template.fxml
diff --git a/fmframework/src/sarsoo/fmframework/jframe/AlbumView.java b/src/main/java/sarsoo/fmframework/jframe/AlbumView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/AlbumView.java
rename to src/main/java/sarsoo/fmframework/jframe/AlbumView.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/Driver.java b/src/main/java/sarsoo/fmframework/jframe/Driver.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/Driver.java
rename to src/main/java/sarsoo/fmframework/jframe/Driver.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/FMObjListView.java b/src/main/java/sarsoo/fmframework/jframe/FMObjListView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/FMObjListView.java
rename to src/main/java/sarsoo/fmframework/jframe/FMObjListView.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/FMObjView.java b/src/main/java/sarsoo/fmframework/jframe/FMObjView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/FMObjView.java
rename to src/main/java/sarsoo/fmframework/jframe/FMObjView.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/Getter.java b/src/main/java/sarsoo/fmframework/jframe/Getter.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/Getter.java
rename to src/main/java/sarsoo/fmframework/jframe/Getter.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/MainMenu.java b/src/main/java/sarsoo/fmframework/jframe/MainMenu.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/MainMenu.java
rename to src/main/java/sarsoo/fmframework/jframe/MainMenu.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/RefListsView.java b/src/main/java/sarsoo/fmframework/jframe/RefListsView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/RefListsView.java
rename to src/main/java/sarsoo/fmframework/jframe/RefListsView.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/TagMenuView.java b/src/main/java/sarsoo/fmframework/jframe/TagMenuView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/TagMenuView.java
rename to src/main/java/sarsoo/fmframework/jframe/TagMenuView.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/TrackView.java b/src/main/java/sarsoo/fmframework/jframe/TrackView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/TrackView.java
rename to src/main/java/sarsoo/fmframework/jframe/TrackView.java
diff --git a/fmframework/src/sarsoo/fmframework/jframe/WikiView.java b/src/main/java/sarsoo/fmframework/jframe/WikiView.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/jframe/WikiView.java
rename to src/main/java/sarsoo/fmframework/jframe/WikiView.java
diff --git a/fmframework/src/sarsoo/fmframework/music/Album.java b/src/main/java/sarsoo/fmframework/music/Album.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/music/Album.java
rename to src/main/java/sarsoo/fmframework/music/Album.java
diff --git a/fmframework/src/sarsoo/fmframework/music/Artist.java b/src/main/java/sarsoo/fmframework/music/Artist.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/music/Artist.java
rename to src/main/java/sarsoo/fmframework/music/Artist.java
diff --git a/fmframework/src/sarsoo/fmframework/music/FMObj.java b/src/main/java/sarsoo/fmframework/music/FMObj.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/music/FMObj.java
rename to src/main/java/sarsoo/fmframework/music/FMObj.java
diff --git a/fmframework/src/sarsoo/fmframework/music/Tag.java b/src/main/java/sarsoo/fmframework/music/Tag.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/music/Tag.java
rename to src/main/java/sarsoo/fmframework/music/Tag.java
diff --git a/fmframework/src/sarsoo/fmframework/music/Track.java b/src/main/java/sarsoo/fmframework/music/Track.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/music/Track.java
rename to src/main/java/sarsoo/fmframework/music/Track.java
diff --git a/fmframework/src/sarsoo/fmframework/music/Wiki.java b/src/main/java/sarsoo/fmframework/music/Wiki.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/music/Wiki.java
rename to src/main/java/sarsoo/fmframework/music/Wiki.java
diff --git a/src/main/java/sarsoo/fmframework/net/.gitignore b/src/main/java/sarsoo/fmframework/net/.gitignore
new file mode 100644
index 0000000..2b8fdcd
--- /dev/null
+++ b/src/main/java/sarsoo/fmframework/net/.gitignore
@@ -0,0 +1 @@
+/Key.java
diff --git a/fmframework/src/sarsoo/fmframework/net/Authenticator.java b/src/main/java/sarsoo/fmframework/net/Authenticator.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/net/Authenticator.java
rename to src/main/java/sarsoo/fmframework/net/Authenticator.java
diff --git a/fmframework/src/sarsoo/fmframework/net/Network.java b/src/main/java/sarsoo/fmframework/net/Network.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/net/Network.java
rename to src/main/java/sarsoo/fmframework/net/Network.java
diff --git a/fmframework/src/sarsoo/fmframework/net/ParamAssembler.java b/src/main/java/sarsoo/fmframework/net/ParamAssembler.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/net/ParamAssembler.java
rename to src/main/java/sarsoo/fmframework/net/ParamAssembler.java
diff --git a/fmframework/src/sarsoo/fmframework/net/TestCall.java b/src/main/java/sarsoo/fmframework/net/TestCall.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/net/TestCall.java
rename to src/main/java/sarsoo/fmframework/net/TestCall.java
diff --git a/fmframework/src/sarsoo/fmframework/net/URLBuilder.java b/src/main/java/sarsoo/fmframework/net/URLBuilder.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/net/URLBuilder.java
rename to src/main/java/sarsoo/fmframework/net/URLBuilder.java
diff --git a/fmframework/src/sarsoo/fmframework/parser/AlbumParser.java b/src/main/java/sarsoo/fmframework/parser/AlbumParser.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/parser/AlbumParser.java
rename to src/main/java/sarsoo/fmframework/parser/AlbumParser.java
diff --git a/fmframework/src/sarsoo/fmframework/parser/Parser.java b/src/main/java/sarsoo/fmframework/parser/Parser.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/parser/Parser.java
rename to src/main/java/sarsoo/fmframework/parser/Parser.java
diff --git a/fmframework/src/sarsoo/fmframework/util/Console.java b/src/main/java/sarsoo/fmframework/util/Console.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/Console.java
rename to src/main/java/sarsoo/fmframework/util/Console.java
diff --git a/fmframework/src/sarsoo/fmframework/util/FMObjList.java b/src/main/java/sarsoo/fmframework/util/FMObjList.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/FMObjList.java
rename to src/main/java/sarsoo/fmframework/util/FMObjList.java
diff --git a/fmframework/src/sarsoo/fmframework/util/Getter.java b/src/main/java/sarsoo/fmframework/util/Getter.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/Getter.java
rename to src/main/java/sarsoo/fmframework/util/Getter.java
diff --git a/fmframework/src/sarsoo/fmframework/util/Maths.java b/src/main/java/sarsoo/fmframework/util/Maths.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/Maths.java
rename to src/main/java/sarsoo/fmframework/util/Maths.java
diff --git a/fmframework/src/sarsoo/fmframework/util/Reference.java b/src/main/java/sarsoo/fmframework/util/Reference.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/Reference.java
rename to src/main/java/sarsoo/fmframework/util/Reference.java
diff --git a/fmframework/src/sarsoo/fmframework/util/ScrobbleSumming.java b/src/main/java/sarsoo/fmframework/util/ScrobbleSumming.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/ScrobbleSumming.java
rename to src/main/java/sarsoo/fmframework/util/ScrobbleSumming.java
diff --git a/fmframework/src/sarsoo/fmframework/util/Scrobbler.java b/src/main/java/sarsoo/fmframework/util/Scrobbler.java
similarity index 100%
rename from fmframework/src/sarsoo/fmframework/util/Scrobbler.java
rename to src/main/java/sarsoo/fmframework/util/Scrobbler.java
diff --git a/src/main/resources/sarsoo/fmframework/fx/styles/FMObjListPane.css b/src/main/resources/sarsoo/fmframework/fx/styles/FMObjListPane.css
new file mode 100644
index 0000000..900bf39
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/styles/FMObjListPane.css
@@ -0,0 +1,46 @@
+.nameLabel{
+	-fx-alignment: center;
+	-fx-font-size: 150%;
+	-fx-font-style: italic;
+	-fx-text-alignment: center;
+	
+
+}
+
+.number{
+	-fx-text-alignment: right;
+	
+	-fx-font-style: italic;
+
+}
+
+.totalScrobbles{
+	
+	-fx-font-style: italic;
+
+}
+
+.stats{
+	
+	
+	-fx-font-size: 300%;
+	
+	-fx-font-style: italic;
+
+}
+
+.pane{
+	
+	
+	
+}
+
+.pieChart{
+	
+	-fx-start-angle: 90;
+	
+	
+}
+
+.default-color0.chart-pie { -fx-pie-color: #820000; }
+.default-color1.chart-pie { -fx-pie-color: #49505b; }
\ No newline at end of file
diff --git a/src/main/resources/sarsoo/fmframework/fx/styles/ObjPane.css b/src/main/resources/sarsoo/fmframework/fx/styles/ObjPane.css
new file mode 100644
index 0000000..6d146c7
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/styles/ObjPane.css
@@ -0,0 +1,29 @@
+.titleLabel{
+	
+	-fx-font-size: 600%;
+	-fx-font-weight: bolder;
+
+}
+
+.subLabel{
+	
+	-fx-font-size: 300%;
+	-fx-font-weight: bold;
+}
+
+.normalLabel{
+	
+	-fx-font-size: 200%;
+	
+}
+
+.wikiTextArea{
+
+
+}
+
+.stats{
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/resources/sarsoo/fmframework/fx/styles/mainPane.css b/src/main/resources/sarsoo/fmframework/fx/styles/mainPane.css
new file mode 100644
index 0000000..8c82183
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/styles/mainPane.css
@@ -0,0 +1,18 @@
+.vBoxStats{
+	-fx-background-color: #001a44;
+}
+
+.gridPane{
+	
+	-fx-background-color: #a2aec1;
+}
+
+.vBoxStatsLabel{
+	
+	-fx-text-fill: white;
+}
+
+.pieChart{
+	
+	-fx-start-angle: 90;
+}
\ No newline at end of file
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/AlbumPane.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/AlbumPane.fxml
new file mode 100644
index 0000000..0abbcc7
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/AlbumPane.fxml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.paint.*?>
+<?import javafx.scene.text.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.AlbumPaneController">
+   <children>
+      <BorderPane fx:id="albumBorderPane" prefHeight="327.0" prefWidth="600.0" stylesheets="@../styles/ObjPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <center>
+                                    <SplitPane dividerPositions="0.5" prefHeight="327.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+                                      <items>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                             <children>
+                                                <GridPane prefHeight="325.0" prefWidth="296.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                                  <columnConstraints>
+                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                                  </columnConstraints>
+                                                  <rowConstraints>
+                                                    <RowConstraints maxHeight="115.0" minHeight="10.0" prefHeight="94.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints maxHeight="181.0" minHeight="10.0" prefHeight="57.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints maxHeight="49.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="43.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="39.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="37.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
+                                                  </rowConstraints>
+                                                   <children>
+                              <AnchorPane>
+                                 <children>
+                                                            <Label fx:id="labelAlbumName" alignment="CENTER" styleClass="titleLabel" text="Album Name" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                                                               <font>
+                                                                  <Font name="System Bold" size="18.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="1">
+                                 <children>
+                                                            <Label fx:id="labelArtistName" alignment="CENTER" styleClass="subLabel" text="Artist Name" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="2">
+                                 <children>
+                                                            <Label fx:id="labelUserScrobbles" alignment="CENTER" styleClass="normalLabel" text="User Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="3">
+                                 <children>
+                                                            <Label fx:id="labelRatio" alignment="CENTER" styleClass="normalLabel" text="Ratio" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="3">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="4">
+                                 <children>
+                                                            <Label fx:id="labelTotalListeners" alignment="CENTER" styleClass="normalLabel" text="Total Listeners" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="4">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="5">
+                                 <children>
+                                                            <Label fx:id="labelTotalScrobbles" alignment="CENTER" styleClass="normalLabel" text="Total Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="5">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                                                   </children>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                             <children>
+                                                <TextArea fx:id="textAreaWiki" editable="false" layoutX="37.0" layoutY="34.0" prefHeight="285.0" prefWidth="296.0" styleClass="wikiTextArea" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                             </children>
+                                          </AnchorPane>
+                                      </items>
+                                    </SplitPane>
+                                 </center>
+                                 <bottom>
+                                    <ToolBar fx:id="toolBar" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                      <items>
+                  <Button fx:id="buttonRefresh" mnemonicParsing="false" onAction="#handleRefresh" text="refresh" />
+                  <Button fx:id="buttonViewArtist" mnemonicParsing="false" onAction="#viewArtist" text="view artist" />
+                                        <Button fx:id="buttonViewOnline" mnemonicParsing="false" onAction="#viewOnline" text="view online" />
+                  <Button fx:id="buttonViewRYM" mnemonicParsing="false" onAction="#viewRYM" text="view rym" />
+                                      </items>
+                                    </ToolBar>
+                                 </bottom>
+                              </BorderPane>
+   </children>
+</AnchorPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/ArtistPane.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/ArtistPane.fxml
new file mode 100644
index 0000000..298aee3
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/ArtistPane.fxml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.paint.*?>
+<?import javafx.scene.text.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.ArtistPaneController">
+   <children>
+      <BorderPane fx:id="albumBorderPane" prefHeight="800.0" prefWidth="1000.0" stylesheets="@../styles/ObjPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <center>
+                                    <SplitPane dividerPositions="0.6983967935871743" prefHeight="327.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+                                      <items>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                             <children>
+                                                <GridPane prefHeight="325.0" prefWidth="296.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                                  <columnConstraints>
+                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                                  </columnConstraints>
+                                                  <rowConstraints>
+                                                    <RowConstraints maxHeight="213.0" minHeight="10.0" prefHeight="213.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints maxHeight="49.0" minHeight="0.0" prefHeight="0.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="43.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="39.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="37.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
+                                                  </rowConstraints>
+                                                   <children>
+                              <AnchorPane>
+                                 <children>
+                                                            <Label fx:id="labelArtistName" alignment="CENTER" prefHeight="165.0" prefWidth="296.0" styleClass="titleLabel" text="Artist Name" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                                                               <font>
+                                                                  <Font name="System Bold" size="18.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="1">
+                                 <children>
+                                                            <Label fx:id="labelUserScrobbles" alignment="CENTER" styleClass="normalLabel" text="User Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="2">
+                                 <children>
+                                                            <Label fx:id="labelRatio" alignment="CENTER" styleClass="normalLabel" text="Ratio" AnchorPane.bottomAnchor="8.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="2">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="3">
+                                 <children>
+                                                            <Label fx:id="labelTotalListeners" alignment="CENTER" styleClass="normalLabel" text="Total Listeners" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="3">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                              <AnchorPane GridPane.rowIndex="4">
+                                 <children>
+                                                            <Label fx:id="labelTotalScrobbles" alignment="CENTER" styleClass="normalLabel" text="Total Scrobbles" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.rowIndex="4">
+                                                               <font>
+                                                                  <Font size="13.0" />
+                                                               </font>
+                                                            </Label>
+                                 </children>
+                              </AnchorPane>
+                                                   </children>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                             <children>
+                                                <TextArea fx:id="textAreaWiki" editable="false" layoutX="37.0" layoutY="34.0" prefHeight="285.0" prefWidth="296.0" styleClass="wikiTextArea" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                             </children>
+                                          </AnchorPane>
+                                      </items>
+                                    </SplitPane>
+                                 </center>
+                                 <bottom>
+                                    <ToolBar fx:id="toolBar" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                      <items>
+                  <Button fx:id="buttonRefresh" mnemonicParsing="false" onAction="#handleRefresh" text="refresh" />
+                  <Button fx:id="buttonViewTracks" mnemonicParsing="false" onAction="#handleViewTracks" text="view tracks" />
+                                        <Button fx:id="buttonViewOnline" mnemonicParsing="false" onAction="#viewOnline" text="view online" />
+                  <Button fx:id="buttonViewRYM" mnemonicParsing="false" onAction="#viewRYM" text="view rym" />
+                                      </items>
+                                    </ToolBar>
+                                 </bottom>
+                              </BorderPane>
+   </children>
+</AnchorPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPane.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
new file mode 100644
index 0000000..58da38c
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPane.fxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane prefWidth="800.0" styleClass="pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.FMObjListPaneController">
+   <children>
+      <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" styleClass="pane" stylesheets="@../styles/FMObjListPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <center>
+            <SplitPane dividerPositions="0.6353383458646616">
+               <items>
+                  <ScrollPane fitToHeight="true" fitToWidth="true" prefViewportHeight="369.0" prefViewportWidth="600.0">
+                     <content>
+                        <GridPane fx:id="gridPaneFMObjs" alignment="CENTER" BorderPane.alignment="CENTER">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="301.0" minWidth="10.0" prefWidth="301.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="290.0" minWidth="10.0" prefWidth="157.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="194.0" minWidth="10.0" prefWidth="106.0" />
+                          </columnConstraints>
+                        </GridPane>
+                     </content>
+                  </ScrollPane>
+                  <SplitPane dividerPositions="0.5" orientation="VERTICAL">
+                     <items>
+                        <PieChart fx:id="pieChart" legendVisible="false" prefHeight="250.0" styleClass="pieChart" />
+                        <PieChart fx:id="pieChartArtists" legendVisible="false" prefHeight="250.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" />
+                     </items>
+                  </SplitPane>
+               </items>
+            </SplitPane>
+         </center>
+         <top>
+            <VBox prefHeight="31.0" BorderPane.alignment="CENTER">
+               <children>
+                  <GridPane>
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="383.0" minWidth="10.0" prefWidth="382.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" maxWidth="533.0" minWidth="10.0" prefWidth="339.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="78.0" minWidth="0.0" prefWidth="78.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                     <children>
+                        <Label fx:id="labelTotalScrobbles" styleClass="stats" text="Label" GridPane.halignment="CENTER" />
+                        <Label fx:id="labelPercent" styleClass="stats" text="Label" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
+                        <Button fx:id="buttonRefresh" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleRefresh" prefHeight="25.0" prefWidth="57.0" text="refresh" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" />
+                     </children>
+                  </GridPane>
+               </children>
+            </VBox>
+         </top>
+      </BorderPane>
+   </children>
+</AnchorPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
new file mode 100644
index 0000000..a369a30
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/FMObjListPaneEdit.fxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane prefWidth="800.0" styleClass="pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.FMObjListPaneEditController">
+   <children>
+      <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" styleClass="pane" stylesheets="@../styles/FMObjListPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <center>
+            <SplitPane dividerPositions="0.6353383458646616">
+               <items>
+                  <ScrollPane fitToHeight="true" fitToWidth="true" prefViewportHeight="369.0" prefViewportWidth="600.0">
+                     <content>
+                        <GridPane fx:id="gridPaneFMObjs" alignment="CENTER" BorderPane.alignment="CENTER">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="301.0" minWidth="10.0" prefWidth="301.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="290.0" minWidth="10.0" prefWidth="157.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" maxWidth="194.0" minWidth="10.0" prefWidth="106.0" />
+                              <ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="194.0" minWidth="10.0" prefWidth="60.0" />
+                          </columnConstraints>
+                        </GridPane>
+                     </content>
+                  </ScrollPane>
+                  <SplitPane dividerPositions="0.5" orientation="VERTICAL">
+                     <items>
+                        <PieChart fx:id="pieChart" legendVisible="false" prefHeight="250.0" styleClass="pieChart" />
+                        <PieChart fx:id="pieChartArtists" legendVisible="false" prefHeight="250.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" />
+                     </items>
+                  </SplitPane>
+               </items>
+            </SplitPane>
+         </center>
+         <top>
+            <VBox prefHeight="31.0" BorderPane.alignment="CENTER">
+               <children>
+                  <AnchorPane>
+                     <children>
+                        <GridPane layoutY="11.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="383.0" minWidth="10.0" prefWidth="382.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" maxWidth="533.0" minWidth="10.0" prefWidth="339.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <Label fx:id="labelTotalScrobbles" styleClass="stats" text="0" GridPane.halignment="CENTER" />
+                              <Label fx:id="labelPercent" styleClass="stats" text="0%" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
+                           </children>
+                        </GridPane>
+                     </children>
+                  </AnchorPane>
+               </children>
+            </VBox>
+         </top>
+         <bottom>
+            <ToolBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+              <items>
+                  <TextField fx:id="textTrack" prefHeight="25.0" prefWidth="217.0" promptText="track" />
+                  <TextField fx:id="textAlbum" prefHeight="25.0" prefWidth="239.0" promptText="album" />
+                  <TextField fx:id="textArtist" prefHeight="25.0" prefWidth="230.0" promptText="artist" />
+                  <MenuButton fx:id="menuButtonAdd" alignment="CENTER_RIGHT" contentDisplay="CENTER" mnemonicParsing="false" text="add">
+                    <items>
+                      <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleAddTrack" text="track" />
+                      <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleAddAlbum" text="album" />
+                        <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleAddArtist" text="artist" />
+                    </items>
+                  </MenuButton>
+                  <Button fx:id="buttonRefresh" contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleRefresh" prefHeight="25.0" prefWidth="57.0" text="refresh" />
+                  <Button mnemonicParsing="false" onAction="#handleSave" text="save" />
+              </items>
+            </ToolBar>
+         </bottom>
+      </BorderPane>
+   </children>
+</AnchorPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/TrackPane.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/TrackPane.fxml
new file mode 100644
index 0000000..b01abe4
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/TrackPane.fxml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.paint.*?>
+<?import javafx.scene.text.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sarsoo.fmframework.fx.controller.TrackPaneController">
+   <children>
+      <BorderPane fx:id="albumBorderPane" prefHeight="327.0" prefWidth="600.0" stylesheets="@../styles/ObjPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                 <center>
+                                    <SplitPane dividerPositions="0.5" prefHeight="327.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+                                      <items>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                             <children>
+                                                <GridPane prefHeight="325.0" prefWidth="296.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                                  <columnConstraints>
+                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                                  </columnConstraints>
+                                                  <rowConstraints>
+                                                    <RowConstraints maxHeight="115.0" minHeight="10.0" prefHeight="94.0" vgrow="SOMETIMES" />
+                              <RowConstraints maxHeight="181.0" minHeight="10.0" prefHeight="57.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints maxHeight="181.0" minHeight="10.0" prefHeight="57.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints maxHeight="49.0" minHeight="10.0" prefHeight="33.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="43.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="39.0" minHeight="10.0" prefHeight="34.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints maxHeight="37.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
+                                                  </rowConstraints>
+                                                   <children>
+                                                      <Label fx:id="labelTrackName" alignment="CENTER" styleClass="titleLabel" text="Track Name" wrapText="true" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.valignment="CENTER">
+                                                         <font>
+                                                            <Font name="System Bold" size="18.0" />
+                                                         </font>
+                                                      </Label>
+                                                      <Label fx:id="labelArtistName" alignment="CENTER" styleClass="subLabel" text="Artist Name" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                                                         <font>
+                                                            <Font size="13.0" />
+                                                         </font>
+                                                      </Label>
+                                                      <Label fx:id="labelUserScrobbles" alignment="CENTER" styleClass="normalLabel" text="User Scrobbles" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
+                                                         <font>
+                                                            <Font size="13.0" />
+                                                         </font>
+                                                      </Label>
+                                                      <Label fx:id="labelRatio" alignment="CENTER" styleClass="normalLabel" text="Ratio" GridPane.halignment="CENTER" GridPane.rowIndex="4">
+                                                         <font>
+                                                            <Font size="13.0" />
+                                                         </font>
+                                                      </Label>
+                                                      <Label fx:id="labelTotalListeners" alignment="CENTER" styleClass="normalLabel" text="Total Listeners" GridPane.halignment="CENTER" GridPane.rowIndex="5">
+                                                         <font>
+                                                            <Font size="13.0" />
+                                                         </font>
+                                                      </Label>
+                                                      <Label fx:id="labelTotalScrobbles" alignment="CENTER" styleClass="normalLabel" text="Total Scrobbles" GridPane.halignment="CENTER" GridPane.rowIndex="6">
+                                                         <font>
+                                                            <Font size="13.0" />
+                                                         </font>
+                                                      </Label>
+                              <Label fx:id="labelAlbumName" alignment="CENTER" styleClass="subLabel" text="Album Name" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                                 <font>
+                                    <Font size="13.0" />
+                                 </font>
+                              </Label>
+                                                   </children>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                             <children>
+                                                <TextArea fx:id="textAreaWiki" editable="false" layoutX="37.0" layoutY="34.0" prefHeight="285.0" prefWidth="296.0" styleClass="wikiTextArea" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                             </children>
+                                          </AnchorPane>
+                                      </items>
+                                    </SplitPane>
+                                 </center>
+                                 <bottom>
+                                    <ToolBar fx:id="toolBar" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                      <items>
+                  <Button fx:id="buttonRefresh" mnemonicParsing="false" onAction="#handleRefresh" text="refresh" />
+                  <Button fx:id="buttonViewAlbum" mnemonicParsing="false" onAction="#viewAlbum" text="view album" />
+                  <Button fx:id="buttonViewArtist" mnemonicParsing="false" onAction="#viewArtist" text="view artist" />
+                                        <Button fx:id="buttonViewOnline" mnemonicParsing="false" onAction="#viewOnline" text="view online" />
+                                      </items>
+                                    </ToolBar>
+                                 </bottom>
+                              </BorderPane>
+   </children>
+</AnchorPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/albumgetpane.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/albumgetpane.fxml
new file mode 100644
index 0000000..99000d5
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/albumgetpane.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="sarsoo.fmframework.fx.controller.albumGetPaneController">
+  <columnConstraints>
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="343.0" minWidth="10.0" prefWidth="238.0" />
+    <ColumnConstraints hgrow="SOMETIMES" maxWidth="423.0" minWidth="10.0" prefWidth="362.0" />
+  </columnConstraints>
+  <rowConstraints>
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+  </rowConstraints>
+   <children>
+      <Button fx:id="getButton" mnemonicParsing="false" text="get" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
+      <TextField fx:id="albumName" GridPane.columnIndex="1" />
+      <TextField fx:id="artistName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+      <Label text="album" GridPane.halignment="CENTER" />
+      <Label text="artist" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+   </children>
+</GridPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
new file mode 100644
index 0000000..a7ec35c
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?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">
+   <top>
+      <MenuBar fx:id="menuBar" BorderPane.alignment="CENTER">
+        <menus>
+            <Menu fx:id="menuFile" mnemonicParsing="false" text="file">
+              <items>
+                  <MenuItem fx:id="menuItemCreateList" mnemonicParsing="false" onAction="#handleCreateList" text="new list" />
+                  <MenuItem fx:id="menuItemListEdit" mnemonicParsing="false" onAction="#handleListEdit" text="open list" />
+              </items>
+            </Menu>
+          <Menu fx:id="menuLookup" mnemonicParsing="false" text="lookup">
+            <items>
+              <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleLookupTrack" text="track" />
+                  <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="album" />
+                  <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleLookupArtist" text="artist" />
+            </items>
+          </Menu>
+          <Menu fx:id="menuTag" mnemonicParsing="false" text="tags" />
+            <Menu fx:id="menuUtil" mnemonicParsing="false" text="util">
+              <items>
+                <MenuItem fx:id="menuItemScrobble" mnemonicParsing="false" onAction="#handleScrobble" text="scrobble" />
+                  <MenuItem fx:id="menuItemCurrentTrack" mnemonicParsing="false" onAction="#handleCurrentTrack" text="current track" />
+                  <MenuItem fx:id="menuItemOpenConsole" mnemonicParsing="false" onAction="#handleOpenConsole" text="open console" />
+                  <MenuItem mnemonicParsing="false" onAction="#handleChangeUsername" text="set username" />
+              </items>
+            </Menu>
+        </menus>
+      </MenuBar>
+   </top>
+   <bottom>
+      <VBox fx:id="vBoxStats" prefHeight="19.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+         <children>
+            <FlowPane fx:id="flowPlaneStats" alignment="TOP_RIGHT" prefHeight="20.0" prefWidth="600.0" styleClass="vBoxStats" stylesheets="@../styles/mainPane.css" VBox.vgrow="NEVER">
+               <children>
+                  <Label fx:id="labelStatsUsername" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="user" />
+                  <Label fx:id="labelStatsScrobblesToday" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesToday" />
+                  <Label fx:id="labelStatsSlash" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="/" />
+                  <Label fx:id="labelStatsScrobblesTotal" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesTotal" />
+               </children>
+            </FlowPane>
+         </children>
+      </VBox>
+   </bottom>
+   <center>
+      <TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" side="BOTTOM" BorderPane.alignment="CENTER">
+         <tabs>
+            <Tab fx:id="tabHome" closable="false" text="home">
+              <content>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                     <children>
+                        <BorderPane prefHeight="354.0" prefWidth="211.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                           <center>
+                              <Accordion fx:id="accordionCharts" prefHeight="325.0" prefWidth="222.0" BorderPane.alignment="CENTER">
+                                <panes>
+                                  <TitledPane fx:id="titledPaneGenres" animated="false" text="genres">
+                                    <content>
+                                      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                             <children>
+                                                <PieChart fx:id="pieChartGenres" prefHeight="263.0" prefWidth="209.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                             </children>
+                                          </AnchorPane>
+                                    </content>
+                                  </TitledPane>
+                                  <TitledPane fx:id="titledPaneRap" animated="false" text="rap">
+                                    <content>
+                                      <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                             <children>
+                                                <GridPane prefHeight="303.0" prefWidth="209.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                                  <columnConstraints>
+                                                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                                  </columnConstraints>
+                                                  <rowConstraints>
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                  </rowConstraints>
+                                                   <children>
+                                                      <PieChart fx:id="pieChartRapTotal" prefHeight="274.0" prefWidth="220.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="total" GridPane.rowIndex="1" />
+                                                      <PieChart fx:id="pieChartRap" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="rap" />
+                                                   </children>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                    </content>
+                                  </TitledPane>
+                                    <TitledPane animated="false" text="rock">
+                                      <content>
+                                        <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                             <children>
+                                                <GridPane prefHeight="240.0" prefWidth="569.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                                   <children>
+                                                      <PieChart fx:id="pieChartRockTotal" prefHeight="274.0" prefWidth="220.0" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="total" GridPane.rowIndex="1" />
+                                                      <PieChart fx:id="pieChartRock" styleClass="pieChart" stylesheets="@../styles/mainPane.css" title="rock" />
+                                                   </children>
+                                                   <columnConstraints>
+                                                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                                   </columnConstraints>
+                                                   <rowConstraints>
+                                                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                   </rowConstraints>
+                                                </GridPane>
+                                             </children>
+                                          </AnchorPane>
+                                      </content>
+                                    </TitledPane>
+                                </panes>
+                              </Accordion>
+                           </center>
+                           <bottom>
+                              <ToolBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                                <items>
+                                  <Button fx:id="buttonPieChartRefresh" mnemonicParsing="false" onAction="#handleRefreshPieChart" text="refresh" />
+                                </items>
+                              </ToolBar>
+                           </bottom>
+                        </BorderPane>
+                     </children>
+                  </AnchorPane>
+              </content>
+            </Tab>
+            
+         </tabs></TabPane>
+   </center>
+</BorderPane>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/template.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/template.fxml
new file mode 100644
index 0000000..1a3f6d1
--- /dev/null
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/template.fxml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<BorderPane fx:id="borderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" 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">
+   <top>
+      <MenuBar fx:id="menuBar" BorderPane.alignment="CENTER">
+        <menus>
+          <Menu fx:id="menuLookup" mnemonicParsing="false" text="Lookup">
+            <items>
+              <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" text="Track" />
+                  <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="Album" />
+                  <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" text="Artist" />
+            </items>
+          </Menu>
+          <Menu mnemonicParsing="false" text="Edit">
+            <items>
+              <MenuItem mnemonicParsing="false" text="Delete" />
+            </items>
+          </Menu>
+          <Menu mnemonicParsing="false" text="Help">
+            <items>
+              <MenuItem mnemonicParsing="false" text="About" />
+            </items>
+          </Menu>
+        </menus>
+      </MenuBar>
+   </top>
+   <bottom>
+      <VBox fx:id="vBoxStats" prefHeight="19.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+         <children>
+            <FlowPane fx:id="flowPlaneStats" alignment="TOP_RIGHT" prefHeight="20.0" prefWidth="600.0" styleClass="vBoxStats" stylesheets="@../styles/mainPane.css" VBox.vgrow="NEVER">
+               <children>
+                  <Label fx:id="labelStatsUsername" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="user" />
+                  <Label fx:id="labelStatsScrobblesToday" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesToday" />
+                  <Label fx:id="labelStatsSlash" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="/" />
+                  <Label fx:id="labelStatsScrobblesTotal" styleClass="vBoxStatsLabel" stylesheets="@../styles/mainPane.css" text="scrobblesTotal" />
+               </children>
+            </FlowPane>
+         </children>
+      </VBox>
+   </bottom>
+   <center>
+      <TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
+         <tabs>
+            <Tab fx:id="tabHome" closable="false" text="home">
+              <content>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                     <children>
+                        <SplitPane fx:id="splitPaneHome" dividerPositions="0.6237458193979933" prefHeight="327.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                          <items>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
+                                 <children>
+                                    <Accordion fx:id="accordionCharts" prefHeight="325.0" prefWidth="222.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                      <panes>
+                                        <TitledPane fx:id="titledPaneGenres" animated="false" text="genres">
+                                          <content>
+                                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                                   <children>
+                                                      <PieChart fx:id="pieChartGenres" layoutX="-189.0" layoutY="-102.0" prefHeight="249.0" prefWidth="220.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                   </children>
+                                                </AnchorPane>
+                                          </content>
+                                        </TitledPane>
+                                        <TitledPane fx:id="titledPaneRap" animated="false" text="rap">
+                                          <content>
+                                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                                   <children>
+                                                      <PieChart prefHeight="274.0" prefWidth="220.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                   </children>
+                                                </AnchorPane>
+                                          </content>
+                                        </TitledPane>
+                                      </panes>
+                                    </Accordion>
+                                 </children>
+                              </AnchorPane>
+                          </items>
+                        </SplitPane>
+                     </children>
+                  </AnchorPane>
+              </content>
+            </Tab>
+            
+         </tabs></TabPane>
+   </center>
+</BorderPane>