diff --git a/composer.json b/composer.json
index 37632d8..50f855f 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,5 @@
     ],
      "autoload": {
         "psr-0": {"Flownode": "src/"}
-    },
-    "require": {
-      "tcpdf/tcpdf": "dev-master",
-     " phpexcel/phpexcel" : ">=1.7.7"
     }
 }
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 103a4f0..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "hash": "d119e85d22cc8e94858ced577312d7fe",
-    "packages": [
-        {
-            "name": "tcpdf/tcpdf",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "git://tcpdf.git.sourceforge.net/gitroot/tcpdf/tcpdf",
-                "reference": "f2aa41dd8252ad6321bad88776889b75b127a60c"
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "time": "1348597020",
-            "type": "library",
-            "installation-source": "source",
-            "autoload": {
-                "classmap": [
-                    "fonts",
-                    "config/lang",
-                    "config",
-                    "2dbarcodes.php",
-                    "barcodes.php",
-                    "datamatrix.php",
-                    "encodings_maps.php",
-                    "htmlcolors.php",
-                    "pdf417.php",
-                    "qrcode.php",
-                    "spotcolors.php",
-                    "tcpdf.php",
-                    "tcpdf_filters.php",
-                    "tcpdf_parser.php",
-                    "unicode_data.php"
-                ]
-            },
-            "license": [
-                "LGPLv3"
-            ],
-            "authors": [
-                {
-                    "name": "Nicola Asuni",
-                    "email": "info@tecnick.com",
-                    "homepage": "http://nicolaasuni.tecnick.com"
-                }
-            ],
-            "description": "TCPDF is a PHP class for generating PDF documents.",
-            "homepage": "http://www.tcpdf.org/",
-            "keywords": [
-                "pdf",
-                "TCPDF",
-                "qrcode",
-                "PDFD32000-2008",
-                "datamatrix",
-                "pdf417",
-                "barcodes"
-            ]
-        }
-    ],
-    "packages-dev": null,
-    "aliases": [
-
-    ],
-    "minimum-stability": "dev",
-    "stability-flags": {
-        "tcpdf/tcpdf": 20
-    }
-}
diff --git a/src/Flownode/Common/Data/Collection.php b/lib/Flownode/Common/Data/Collection.php
similarity index 100%
rename from src/Flownode/Common/Data/Collection.php
rename to lib/Flownode/Common/Data/Collection.php
diff --git a/src/Flownode/Common/Data/DataSource.php b/lib/Flownode/Common/Data/DataSource.php
similarity index 100%
rename from src/Flownode/Common/Data/DataSource.php
rename to lib/Flownode/Common/Data/DataSource.php
diff --git a/src/Flownode/Common/Data/Worker/WorkerArray.php b/lib/Flownode/Common/Data/Worker/WorkerArray.php
similarity index 100%
rename from src/Flownode/Common/Data/Worker/WorkerArray.php
rename to lib/Flownode/Common/Data/Worker/WorkerArray.php
diff --git a/src/Flownode/Common/Data/Worker/WorkerFactory.php b/lib/Flownode/Common/Data/Worker/WorkerFactory.php
similarity index 100%
rename from src/Flownode/Common/Data/Worker/WorkerFactory.php
rename to lib/Flownode/Common/Data/Worker/WorkerFactory.php
diff --git a/src/Flownode/Common/Data/Worker/WorkerInterface.php b/lib/Flownode/Common/Data/Worker/WorkerInterface.php
similarity index 100%
rename from src/Flownode/Common/Data/Worker/WorkerInterface.php
rename to lib/Flownode/Common/Data/Worker/WorkerInterface.php
diff --git a/src/Flownode/Common/Data/Worker/WorkerObject.php b/lib/Flownode/Common/Data/Worker/WorkerObject.php
similarity index 100%
rename from src/Flownode/Common/Data/Worker/WorkerObject.php
rename to lib/Flownode/Common/Data/Worker/WorkerObject.php
diff --git a/src/Flownode/Common/Decorator/ValueDecorators.php b/lib/Flownode/Common/Decorator/ValueDecorators.php
similarity index 100%
rename from src/Flownode/Common/Decorator/ValueDecorators.php
rename to lib/Flownode/Common/Decorator/ValueDecorators.php
diff --git a/src/Flownode/Common/Formatter/Formatter.php b/lib/Flownode/Common/Formatter/Formatter.php
similarity index 100%
rename from src/Flownode/Common/Formatter/Formatter.php
rename to lib/Flownode/Common/Formatter/Formatter.php
diff --git a/src/Flownode/Common/Formatter/FormatterInterface.class.php b/lib/Flownode/Common/Formatter/FormatterInterface.class.php
similarity index 100%
rename from src/Flownode/Common/Formatter/FormatterInterface.class.php
rename to lib/Flownode/Common/Formatter/FormatterInterface.class.php
diff --git a/src/Flownode/Common/Formatter/Html/FormatterHtml.php b/lib/Flownode/Common/Formatter/Html/FormatterHtml.php
similarity index 100%
rename from src/Flownode/Common/Formatter/Html/FormatterHtml.php
rename to lib/Flownode/Common/Formatter/Html/FormatterHtml.php
diff --git a/src/Flownode/Switchboard/Channel.php b/lib/Flownode/Switchboard/Channel.php
similarity index 100%
rename from src/Flownode/Switchboard/Channel.php
rename to lib/Flownode/Switchboard/Channel.php
diff --git a/src/Flownode/Switchboard/Channels.php b/lib/Flownode/Switchboard/Channels.php
similarity index 100%
rename from src/Flownode/Switchboard/Channels.php
rename to lib/Flownode/Switchboard/Channels.php
diff --git a/src/Flownode/Switchboard/Response.php b/lib/Flownode/Switchboard/Response.php
similarity index 100%
rename from src/Flownode/Switchboard/Response.php
rename to lib/Flownode/Switchboard/Response.php
diff --git a/src/Flownode/Switchboard/SwitchBoard.php b/lib/Flownode/Switchboard/SwitchBoard.php
similarity index 100%
rename from src/Flownode/Switchboard/SwitchBoard.php
rename to lib/Flownode/Switchboard/SwitchBoard.php
diff --git a/src/Flownode/UI/Bootstrap/Common/Divider.php b/lib/Flownode/UI/Bootstrap/Common/Divider.php
similarity index 100%
rename from src/Flownode/UI/Bootstrap/Common/Divider.php
rename to lib/Flownode/UI/Bootstrap/Common/Divider.php
diff --git a/src/Flownode/UI/Bootstrap/Common/Navigation/Link.php b/lib/Flownode/UI/Bootstrap/Common/Navigation/Link.php
similarity index 100%
rename from src/Flownode/UI/Bootstrap/Common/Navigation/Link.php
rename to lib/Flownode/UI/Bootstrap/Common/Navigation/Link.php
diff --git a/src/Flownode/UI/Bootstrap/Component/Dropdown.php b/lib/Flownode/UI/Bootstrap/Component/Dropdown.php
similarity index 100%
rename from src/Flownode/UI/Bootstrap/Component/Dropdown.php
rename to lib/Flownode/UI/Bootstrap/Component/Dropdown.php
diff --git a/src/Flownode/UI/Common/DOM/Element.php b/lib/Flownode/UI/Common/DOM/Element.php
similarity index 100%
rename from src/Flownode/UI/Common/DOM/Element.php
rename to lib/Flownode/UI/Common/DOM/Element.php
diff --git a/src/Flownode/UI/Common/DOM/Node.php b/lib/Flownode/UI/Common/DOM/Node.php
similarity index 100%
rename from src/Flownode/UI/Common/DOM/Node.php
rename to lib/Flownode/UI/Common/DOM/Node.php
diff --git a/src/Flownode/UI/Common/DOM/NodeCollection.php b/lib/Flownode/UI/Common/DOM/NodeCollection.php
similarity index 100%
rename from src/Flownode/UI/Common/DOM/NodeCollection.php
rename to lib/Flownode/UI/Common/DOM/NodeCollection.php