diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk
index 391f7de..a950798 100644
--- a/nbproject/Makefile-Debug.mk
+++ b/nbproject/Makefile-Debug.mk
@@ -35,10 +35,10 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
 
 # Object Files
 OBJECTFILES= \
-	${OBJECTDIR}/_ext/1360931409/mpc.o \
 	${OBJECTDIR}/functions.o \
 	${OBJECTDIR}/lang.o \
 	${OBJECTDIR}/lenv.o \
+	${OBJECTDIR}/lib/mpc/mpc.o \
 	${OBJECTDIR}/lval.o \
 	${OBJECTDIR}/main.o \
 	${OBJECTDIR}/util.o
@@ -68,11 +68,6 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/klisp: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/klisp ${OBJECTFILES} ${LDLIBSOPTIONS}
 
-${OBJECTDIR}/_ext/1360931409/mpc.o: ../mpc/mpc.c 
-	${MKDIR} -p ${OBJECTDIR}/_ext/1360931409
-	${RM} "$@.d"
-	$(COMPILE.c) -g -Wall -Ilib/mpc `pkg-config --cflags libedit` -std=c99  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1360931409/mpc.o ../mpc/mpc.c
-
 ${OBJECTDIR}/functions.o: functions.c 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
@@ -88,6 +83,11 @@ ${OBJECTDIR}/lenv.o: lenv.c
 	${RM} "$@.d"
 	$(COMPILE.c) -g -Wall -Ilib/mpc `pkg-config --cflags libedit` -std=c99  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lenv.o lenv.c
 
+${OBJECTDIR}/lib/mpc/mpc.o: lib/mpc/mpc.c 
+	${MKDIR} -p ${OBJECTDIR}/lib/mpc
+	${RM} "$@.d"
+	$(COMPILE.c) -g -Wall -Ilib/mpc `pkg-config --cflags libedit` -std=c99  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/mpc/mpc.o lib/mpc/mpc.c
+
 ${OBJECTDIR}/lval.o: lval.c 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk
index 4eab6d2..e742379 100644
--- a/nbproject/Makefile-Release.mk
+++ b/nbproject/Makefile-Release.mk
@@ -35,10 +35,10 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
 
 # Object Files
 OBJECTFILES= \
-	${OBJECTDIR}/_ext/1360931409/mpc.o \
 	${OBJECTDIR}/functions.o \
 	${OBJECTDIR}/lang.o \
 	${OBJECTDIR}/lenv.o \
+	${OBJECTDIR}/lib/mpc/mpc.o \
 	${OBJECTDIR}/lval.o \
 	${OBJECTDIR}/main.o \
 	${OBJECTDIR}/util.o
@@ -68,11 +68,6 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/klisp: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/klisp ${OBJECTFILES} ${LDLIBSOPTIONS}
 
-${OBJECTDIR}/_ext/1360931409/mpc.o: ../mpc/mpc.c 
-	${MKDIR} -p ${OBJECTDIR}/_ext/1360931409
-	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1360931409/mpc.o ../mpc/mpc.c
-
 ${OBJECTDIR}/functions.o: functions.c 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
@@ -88,6 +83,11 @@ ${OBJECTDIR}/lenv.o: lenv.c
 	${RM} "$@.d"
 	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lenv.o lenv.c
 
+${OBJECTDIR}/lib/mpc/mpc.o: lib/mpc/mpc.c 
+	${MKDIR} -p ${OBJECTDIR}/lib/mpc
+	${RM} "$@.d"
+	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/mpc/mpc.o lib/mpc/mpc.c
+
 ${OBJECTDIR}/lval.o: lval.c 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk
index 5b25bd3..f2cf699 100644
--- a/nbproject/Makefile-impl.mk
+++ b/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 
 
 # Project Name
-PROJECTNAME=KLisp
+PROJECTNAME=klisp
 
 # Active Configuration
 DEFAULTCONF=Debug
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 20f2378..ceee75e 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -9,7 +9,7 @@
       <itemPath>lenv.h</itemPath>
       <itemPath>lval.h</itemPath>
       <itemPath>main.h</itemPath>
-      <itemPath>../mpc/mpc.h</itemPath>
+      <itemPath>lib/mpc/mpc.h</itemPath>
       <itemPath>util.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
@@ -24,7 +24,7 @@
       <itemPath>lenv.c</itemPath>
       <itemPath>lval.c</itemPath>
       <itemPath>main.c</itemPath>
-      <itemPath>../mpc/mpc.c</itemPath>
+      <itemPath>lib/mpc/mpc.c</itemPath>
       <itemPath>util.c</itemPath>
     </logicalFolder>
     <logicalFolder name="TestFiles"
@@ -67,10 +67,6 @@
           </linkerLibItems>
         </linkerTool>
       </compileType>
-      <item path="../mpc/mpc.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../mpc/mpc.h" ex="false" tool="3" flavor2="0">
-      </item>
       <item path="functions.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="functions.h" ex="false" tool="3" flavor2="0">
@@ -83,6 +79,10 @@
       </item>
       <item path="lenv.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="lib/mpc/mpc.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="lib/mpc/mpc.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="lval.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="lval.h" ex="false" tool="3" flavor2="0">
@@ -116,10 +116,6 @@
           <developmentMode>5</developmentMode>
         </asmTool>
       </compileType>
-      <item path="../mpc/mpc.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="../mpc/mpc.h" ex="false" tool="3" flavor2="0">
-      </item>
       <item path="functions.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="functions.h" ex="false" tool="3" flavor2="0">
@@ -132,6 +128,10 @@
       </item>
       <item path="lenv.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="lib/mpc/mpc.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="lib/mpc/mpc.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="lval.c" ex="false" tool="0" flavor2="0">
       </item>
       <item path="lval.h" ex="false" tool="3" flavor2="0">