diff --git a/.classpath b/.classpath
index 2af53607..62f30751 100644
--- a/.classpath
+++ b/.classpath
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/.svn/**" kind="src" output="dist/classes" path="src/main/java"/>
-	<classpathentry excluding="**/.svn/**" kind="src" output="dist/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/com/megginson/sax/xml-writer/0.2/xml-writer-0.2.jar"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/narya"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/com/jcraft/jogg/0.0.7/jogg-0.0.7.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/com/jcraft/jorbis/0.0.15/jorbis-0.0.15.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/lwjgl/lwjgl/2.6/lwjgl-2.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/lwjgl/lwjgl_util/2.6/lwjgl_util-2.6.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/net/javazoom/jlayer/1.0/jlayer-1.0.jar"/>
-	<classpathentry kind="output" path="dist/classes"/>
+	<classpathentry excluding="**/OggPlayer.java|**/ModPlayer.java|**/MidiPlayer.java|**/Mp3Player.java" kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.project b/.project
index c0a9d05d..93ba2bd6 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..a79f03de
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Thu Dec 09 14:25:49 PST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 00000000..636fd77e
--- /dev/null
+++ b/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Thu Dec 09 14:25:21 PST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1