diff --git a/build.default.properties b/build.default.properties
index 6f12c23..08606f4 100644
--- a/build.default.properties
+++ b/build.default.properties
@@ -15,8 +15,9 @@ release.stability = beta
 api.version = 0.1.5
 api.stability = beta
 
-php.version = 5.5.8
+php.version = 5.5.10
 php.configure = --prefix=/opt/appserver \
+				--enable-debug \
                 --enable-sockets \
                 --enable-fpm \
                 --enable-maintainer-zts \
@@ -39,7 +40,7 @@ php.configure = --prefix=/opt/appserver \
                 --with-zlib \
 
 zmq.version = dev-master
-pthreads.version = dev-master
+pthreads.version = 1.0.1
 memcached.version = 2.1.0
 redis.version = 2.2.3
 apcu.version = 4.0.2
diff --git a/build.xml b/build.xml
index bf6e052..b91e056 100644
--- a/build.xml
+++ b/build.xml
@@ -161,7 +161,7 @@
     <!-- Prepares the PHP sources for the runtime                             -->
     <!-- ==================================================================== -->
     <target name="prepare-source" depends="prepare" description="Prepares the PHP sources for the runtime.">
-        <!-- prepare PHP sources -->
+    	<!-- prepare PHP sources -->
         <antcall target="get-php-src"/>
         <untar src="/tmp/php-${php.version}.tar.gz" dest="${c-build.dir}" compression="gzip"/>
         <chmod perm="755">
@@ -169,44 +169,50 @@
                 <include name="**/*"/>
             </fileset>
         </chmod>
+    	
+    	<!-- recreate symlink -->
+    	<delete file="${c-build.dir}/php" followsymlinks="false" removenotfollowedsymlinks="true" />
+    	<symlink link="${c-build.dir}/php" resource="${c-build.dir}/php-${php.version}"/>
         
-        <!--
         <antcall target="get-pthreads-src"/>
         <untar src="/tmp/pthreads-${pthreads.version}.tgz" dest="/tmp" compression="gzip"/>
-        <move todir="${c-build.dir}/php-${php.version}/ext/pthreads">
+        <move todir="${c-build.dir}/php/ext/pthreads">
             <fileset dir="/tmp/pthreads-${pthreads.version}"/>
         </move>
-        -->
     	
-        <exec executable="git" dir="${c-build.dir}/php-${php.version}/ext">
+    	<!-- pthreads head
+        <exec executable="git" dir="${c-build.dir}/php/ext">
             <arg line="clone https://github.com/krakjoe/pthreads.git"/>
         </exec>
+    	-->
     	
-    	<exec executable="git" dir="${c-build.dir}/php-${php.version}/ext">
+    	<!-- zmq head
+    	<exec executable="git" dir="${c-build.dir}/php/ext">
             <arg line="clone https://github.com/mkoppanen/php-zmq.git zmq"/>
         </exec>
+        -->
 
         <antcall target="get-memcached-src"/>
         <untar src="/tmp/memcached-${memcached.version}.tgz" dest="/tmp" compression="gzip"/>
-        <move todir="${c-build.dir}/php-${php.version}/ext/memcached">
+        <move todir="${c-build.dir}/php/ext/memcached">
             <fileset dir="/tmp/memcached-${memcached.version}"/>
         </move>
         
         <antcall target="get-redis-src"/>
         <untar src="/tmp/redis-${redis.version}.tgz" dest="/tmp" compression="gzip"/>
-        <move todir="${c-build.dir}/php-${php.version}/ext/redis">
+        <move todir="${c-build.dir}/php/ext/redis">
             <fileset dir="/tmp/redis-${redis.version}"/>
         </move>
         
         <antcall target="get-apcu-src"/>
         <untar src="/tmp/apcu-${apcu.version}.tgz" dest="/tmp" compression="gzip"/>
-        <move todir="${c-build.dir}/php-${php.version}/ext/apcu">
+        <move todir="${c-build.dir}/php/ext/apcu">
             <fileset dir="/tmp/apcu-${apcu.version}"/>
         </move>
         
         <antcall target="get-xdebug-src"/>
         <untar src="/tmp/xdebug-${xdebug.version}.tgz" dest="/tmp" compression="gzip"/>
-        <move todir="${c-build.dir}/php-${php.version}/ext/xdebug">
+        <move todir="${c-build.dir}/php/ext/xdebug">
             <fileset dir="/tmp/xdebug-${xdebug.version}"/>
         </move>
     </target>
@@ -215,14 +221,14 @@
     <!-- Init the PHP source for the build environment                        -->
     <!-- ==================================================================== -->
     <target name="configure" description="Configures the php runtime environment.">
-        <delete file="${c-build.dir}/php-${php.version}/aclocal.m4"/>
-        <delete file="${c-build.dir}/php-${php.version}/configure"/>
-        <exec dir="${c-build.dir}/php-${php.version}" executable="sh">
+        <delete file="${c-build.dir}/php/aclocal.m4"/>
+        <delete file="${c-build.dir}/php/configure"/>
+        <exec dir="${c-build.dir}/php" executable="sh">
             <arg value="buildconf"/>
             <arg line="--force"/>
         </exec>
         <!-- configure, compile and install PHP binary -->
-        <exec dir="${c-build.dir}/php-${php.version}" executable="sh">
+        <exec dir="${c-build.dir}/php" executable="sh">
             <!-- <env key="CC" value="${php.cc}"/> -->
             <arg line="configure ${php.configure}"/>
         </exec>
@@ -232,7 +238,7 @@
     <!-- Makes the PHP source for the PHP build runtime                       -->
     <!-- ==================================================================== -->
     <target name="make" description="Compiles the php runtime environment.">
-        <exec dir="${c-build.dir}/php-${php.version}" executable="make"/>
+        <exec dir="${c-build.dir}/php" executable="make"/>
     </target>
     
     <!-- ==================================================================== -->
@@ -259,8 +265,8 @@
     <!-- Runs php tests                                                       -->
     <!-- ==================================================================== -->
 	<target name="run-tests" description="Runs the php tests">
-		<exec dir="${c-build.dir}/php-${php.version}" executable="php">
-			<env key="TEST_PHP_EXECUTABLE" value="${c-build.dir}/php-${php.version}/sapi/cli/php"/>
+		<exec dir="${c-build.dir}/php" executable="php">
+			<env key="TEST_PHP_EXECUTABLE" value="${c-build.dir}/php/sapi/cli/php"/>
 			<arg line="./run-tests.php ${c-php-tests.dir}"/>
 		</exec>
 	</target>
diff --git a/appserver.launch b/launch/appserver.launch
similarity index 96%
rename from appserver.launch
rename to launch/appserver.launch
index 669319b..ad32941 100644
--- a/appserver.launch
+++ b/launch/appserver.launch
@@ -17,8 +17,8 @@
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
 <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-d date.timezone=Europe/Berlin -d zend_extension=${project_loc}/build/php-5.5.9/modules/xdebug.so /opt/appserver/server.php"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/php-5.5.9/sapi/cli/php"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-d date.timezone=Europe/Berlin -d zend_extension=${project_loc}/build/php/modules/xdebug.so /opt/appserver/server.php"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/php/sapi/cli/php"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="php-ext-appserver"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.macosx.base.1221491367"/>
diff --git a/php-ext-appserver.launch b/launch/php-ext-appserver.launch
similarity index 96%
rename from php-ext-appserver.launch
rename to launch/php-ext-appserver.launch
index 9706dc9..ada1aa6 100644
--- a/php-ext-appserver.launch
+++ b/launch/php-ext-appserver.launch
@@ -17,8 +17,8 @@
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
 <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="build/php-5.5.9/ext/appserver/appserver.php"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/php-5.5.9/sapi/cli/php"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-dappserver.remove_constants=PHP_SAPI, build/php/ext/appserver/appserver.php"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/php/sapi/cli/php"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="php-ext-appserver"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.macosx.base.1221491367"/>
diff --git a/webserver.launch b/launch/webserver.launch
similarity index 94%
rename from webserver.launch
rename to launch/webserver.launch
index d68a09d..2a93c27 100644
--- a/webserver.launch
+++ b/launch/webserver.launch
@@ -17,8 +17,8 @@
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
 <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-d date.timezone=Europe/Berlin -d zend_extension=${project_loc}/build/php-5.5.8/modules/xdebug.so /home/zelgerj/Repositories/TechDivision_WebServer/src/bin/webserver"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/php-5.5.8/sapi/cli/php"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-d date.timezone=Europe/Berlin -d zend_extension=${project_loc}/build/php/modules/xdebug.so /home/zelgerj/Repositories/TechDivision_WebServer/src/bin/webserver"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/php/sapi/cli/php"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="php-ext-appserver"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.macosx.base.1221491367"/>
diff --git a/src/appserver.php b/src/appserver.php
index 5aacc3d..b100b8f 100644
--- a/src/appserver.php
+++ b/src/appserver.php
@@ -19,8 +19,8 @@
  * @author      Johann Zelger <jz@techdivision.com>
  */
 
-appserver_redefine('PHP_SAPI', 'appserver');
-echo "CALL appserver_redefine('PHP_SAPI', 'appserver'): -> SAPI_TYPE: " . PHP_SAPI;
+define('PHP_SAPI', 'appserver');
+echo "Constant PHP_SAPI: -> SAPI_TYPE: " . PHP_SAPI;
 echo PHP_EOL . "==========================================". PHP_EOL;
 
 appserver_set_headers_sent(true);