diff --git a/features/optimize_use.feature b/features/optimize_use.feature
index 4fb767c..b2507e2 100644
--- a/features/optimize_use.feature
+++ b/features/optimize_use.feature
@@ -47,4 +47,38 @@ Feature: Optimize use
 
                      return $service;
             """
+    Scenario: Organize use for file without namespace and other uses
+        Given a PHP File named "src/Foo.php" with:
+            """
+            <?php
+
+            class Foo
+            {
+                public function operation()
+                {
+                    return new \Bar\Qux\Adapter();
+                }
+            }
+            """
+        When I use refactoring "optimize-use" with:
+            | arg       | value       |
+            | file      | src/Foo.php |
+        Then the PHP File "src/Foo.php" should be refactored:
+            """
+            --- a/vfs://project/src/Foo.php
+            +++ b/vfs://project/src/Foo.php
+            @@ -1,4 +1,6 @@
+             <?php
 
+            +use Bar\Qux\Adapter;
+            +
+             class Foo
+             {
+            @@ -5,5 +5,5 @@
+                 public function operation()
+                 {
+            -        return new \Bar\Qux\Adapter();
+            +        return new Adapter();
+                 }
+             }
+            """
\ No newline at end of file
diff --git a/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php b/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php
index 0d66146..63f876a 100644
--- a/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php
+++ b/src/main/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysis.php
@@ -22,6 +22,7 @@
 
 use TokenReflection\Broker;
 use TokenReflection\Broker\Backend\Memory;
+use TokenReflection\ReflectionNamespace;
 
 class StaticCodeAnalysis extends CodeAnalysis
 {
@@ -143,11 +144,12 @@ public function findClasses(File $file)
 
         $file = $this->broker->processString($file->getCode(), $file->getRelativePath(), true);
         foreach ($file->getNamespaces() as $namespace) {
+            $noNamespace = ReflectionNamespace::NO_NAMESPACE_NAME === $namespace->getName();
             foreach ($namespace->getClasses() as $class) {
                 $classes[] = new PhpClass(
                     PhpName::createDeclarationName($class->getName()),
                     $class->getStartLine(),
-                    $namespace->getStartLine()
+                    $noNamespace ? 0 : $namespace->getStartLine()
                 );
             }
         }
diff --git a/src/main/QafooLabs/Refactoring/Application/OptimizeUse.php b/src/main/QafooLabs/Refactoring/Application/OptimizeUse.php
index ec950ff..ce9d8de 100644
--- a/src/main/QafooLabs/Refactoring/Application/OptimizeUse.php
+++ b/src/main/QafooLabs/Refactoring/Application/OptimizeUse.php
@@ -37,6 +37,7 @@ public function refactor(File $file)
         $occurances = $this->phpNameScanner->findNames($file);
         $class = $classes[0];
 
+        $appendNewLine = 0 === $class->namespaceDeclarationLine();
         $lastUseStatementLine = $class->namespaceDeclarationLine() + 2;
         $usedNames = array();
         $fqcns = array();
@@ -44,7 +45,7 @@ public function refactor(File $file)
         foreach ($occurances as $occurance) {
             $name = $occurance->name();
 
-            if ($name->type() === PhpName::TYPE_NAMESPACE) {
+            if ($name->type() === PhpName::TYPE_NAMESPACE || $name->type() === PhpName::TYPE_CLASS) {
                 continue;
             }
 
@@ -67,7 +68,13 @@ public function refactor(File $file)
             $buffer->replaceString($occurance->declarationLine(), '\\'.$name->fullyQualifiedName(), $name->shortname());
 
             if (!in_array($name->fullyQualifiedName(), $usedNames)) {
-                $buffer->append($lastUseStatementLine, array(sprintf('use %s;', $name->fullyQualifiedName())));
+                $lines = array(sprintf('use %s;', $name->fullyQualifiedName()));
+                if ($appendNewLine) {
+                    $appendNewLine = FALSE;
+                    $lines[] = '';
+                }
+
+                $buffer->append($lastUseStatementLine, $lines);
                 $lastUseStatementLine++;
             }
         }
diff --git a/src/test/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysisTest.php b/src/test/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysisTest.php
new file mode 100644
index 0000000..b24394e
--- /dev/null
+++ b/src/test/QafooLabs/Refactoring/Adapters/TokenReflection/StaticCodeAnalysisTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace QafooLabs\Refactoring\Adapters\TokenReflection;
+
+use PHPUnit_Framework_TestCase;
+use QafooLabs\Refactoring\Domain\Model\File;
+
+class StaticCodeAnalysisTest extends PHPUnit_Framework_TestCase 
+{
+    public function testNamespaceDeclarationForFileWithoutNamespace_isInLine0()
+    {
+        $file = new File('without-namespace.php', <<<'PHP'
+<?php
+
+class WithoutNamespace
+{
+
+}
+PHP
+        );
+
+        $analysis = new StaticCodeAnalysis();
+        $classes = $analysis->findClasses($file);
+        $class = $classes[0];
+
+        $this->assertEquals(0, $class->namespaceDeclarationLine(), 'namespace declaration line for file without namespace');
+    }
+}