diff --git a/Makefile b/Makefile
index fd9e2f59..8fe71f05 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,9 @@ build: clean cythonize
 install: clean cythonize
 	python setup.py install
 
+uninstall:
+	- pip uninstall -y -q dependency-injector 2> /dev/null
+
 test:
 	# Unit tests with coverage report
 	coverage erase
diff --git a/docs/conf.py b/docs/conf.py
index 51742b96..3e2d3af9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,7 +56,7 @@ author = u'ETS Labs'
 #
 # The short X.Y version.
 # Getting version:
-with open('../dependency_injector/__init__.py') as init_file:
+with open('../src/dependency_injector/__init__.py') as init_file:
     version = re.search('VERSION = \'(.*?)\'', init_file.read()).group(1)
 
 # The full version, including alpha/beta/rc tags.
@@ -281,7 +281,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
   (master_doc, 'Dependency Injector', u'Dependency Injector Documentation',
-   author, 'Dependency Injector', 'Python dependency injection framework',
+   author, 'Dependency Injector', 'Dependency injection microframework for Python',
    'Miscellaneous'),
 ]
 
diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
index 734ea81d..0b5e9807 100644
--- a/docs/main/changelog.rst
+++ b/docs/main/changelog.rst
@@ -9,9 +9,14 @@ follows `Semantic versioning`_
 
 Development version
 -------------------
-- Remove ``@inject`` decorator.
 - Add ``dependency_injector.injections`` module (C extension).
-- Add makefile (``clean``, ``tests`` & ``publish`` commands).
+- Remove ``@inject`` decorator.
+- Add makefile (``clean``, ``test``, ``build``, ``install``, ``uninstall`` 
+  & ``publish`` commands).
+- Update repository structure:
+
+    - Sources are moved under ``src``.
+    - Tests are moved under ``tests/unit``.
 
 .. - No features.
 
diff --git a/src/dependency_injector/injections.so b/src/dependency_injector/injections.so
deleted file mode 100755
index 85286d7f..00000000
Binary files a/src/dependency_injector/injections.so and /dev/null differ