diff --git a/build.xml b/build.xml
index 072101cde..7e51cd94d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="name-of-project" default="build-phpcs">
+<project name="ProcessMaker Michelangelo" default="build-phpcs">
     <target name="build"
         depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpdox,phpunit,phpcb"/>
 
@@ -47,7 +47,7 @@
   <apply executable="php" failonerror="true">
    <arg value="-l" />
 
-   <fileset dir="${basedir}/workflow/methods/login">
+   <fileset dir="${basedir}/workflow/engine/src">
     <include name="*.php" />
     <modified />
    </fileset>
@@ -59,7 +59,7 @@
   <exec executable="phploc">
    <arg value="--log-csv" />
    <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/workflow/engine" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -68,14 +68,14 @@
    <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
    <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
    <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
  <target name="phpmd"
          description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="phpmd">
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
    <arg value="text" />
    <arg value="codesize" /> <!--  ${basedir}/build/phpmd.xml" /> !-->
   </exec>
@@ -83,7 +83,7 @@
 
  <target name="phpmd-ci" description="Perform project mess detection using PHPMD creating a log file for the continuous integration server">
   <exec executable="phpmd">
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
    <arg value="xml" />
    <arg value="${basedir}/build/phpmd.xml" />
    <arg value="--reportfile" />
@@ -95,8 +95,8 @@
          description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
   <exec executable="phpcs">
    <arg value="--standard=PSR2" />
-   <arg path="${basedir}/workflow/engine/methods/login" />
-   <arg path="${basedir}/workflow/engine/methods/services" />
+   <arg path="${basedir}/workflow/engine/src" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -105,10 +105,7 @@
    <arg value="--report=checkstyle" />
    <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
    <arg value="--standard=PSR2" />
-   <arg path="${basedir}/gulliver/system" />
-   <arg path="${basedir}/workflow/engine/methods" />
-   <arg path="${basedir}/workflow/engine/classes" />
-   <arg path="${basedir}/workflow/engine/controllers" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -118,8 +115,7 @@
    <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
    <arg value="--standard=PSR2" />
    <arg value="-l" />
-   <arg path="${basedir}/workflow/engine/methods/login" />
-   <arg path="${basedir}/workflow/engine/classes" />
+   <arg path="${basedir}/workflow/engine/src" />
   </exec>
  </target>
 
@@ -127,7 +123,7 @@
   <exec executable="phpcpd">
    <arg value="--log-pmd" />
    <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/src" />
   </exec>
  </target>
 
@@ -144,7 +140,7 @@
    <arg value="--log" />
    <arg path="${basedir}/build/logs" />
    <arg value="--source" />
-   <arg path="${basedir}/workflow" />
+   <arg path="${basedir}/workflow/engine/src" />
    <arg value="--output" />
    <arg path="${basedir}/build/code-browser" />
   </exec>