diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala b/akka-amqp/src/main/scala/akka/amqp/AMQP.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala
rename to akka-amqp/src/main/scala/akka/amqp/AMQP.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQPMessage.scala b/akka-amqp/src/main/scala/akka/amqp/AMQPMessage.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQPMessage.scala
rename to akka-amqp/src/main/scala/akka/amqp/AMQPMessage.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ConsumerActor.scala b/akka-amqp/src/main/scala/akka/amqp/ConsumerActor.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ConsumerActor.scala
rename to akka-amqp/src/main/scala/akka/amqp/ConsumerActor.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExampleSession.scala b/akka-amqp/src/main/scala/akka/amqp/ExampleSession.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExampleSession.scala
rename to akka-amqp/src/main/scala/akka/amqp/ExampleSession.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExchangeType.scala b/akka-amqp/src/main/scala/akka/amqp/ExchangeType.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExchangeType.scala
rename to akka-amqp/src/main/scala/akka/amqp/ExchangeType.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantChannelActor.scala b/akka-amqp/src/main/scala/akka/amqp/FaultTolerantChannelActor.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantChannelActor.scala
rename to akka-amqp/src/main/scala/akka/amqp/FaultTolerantChannelActor.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantConnectionActor.scala b/akka-amqp/src/main/scala/akka/amqp/FaultTolerantConnectionActor.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantConnectionActor.scala
rename to akka-amqp/src/main/scala/akka/amqp/FaultTolerantConnectionActor.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ProducerActor.scala b/akka-amqp/src/main/scala/akka/amqp/ProducerActor.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ProducerActor.scala
rename to akka-amqp/src/main/scala/akka/amqp/ProducerActor.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RPC.scala b/akka-amqp/src/main/scala/akka/amqp/rpc/RPC.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RPC.scala
rename to akka-amqp/src/main/scala/akka/amqp/rpc/RPC.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RpcClientActor.scala b/akka-amqp/src/main/scala/akka/amqp/rpc/RpcClientActor.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RpcClientActor.scala
rename to akka-amqp/src/main/scala/akka/amqp/rpc/RpcClientActor.scala
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RpcServerActor.scala b/akka-amqp/src/main/scala/akka/amqp/rpc/RpcServerActor.scala
similarity index 100%
rename from akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RpcServerActor.scala
rename to akka-amqp/src/main/scala/akka/amqp/rpc/RpcServerActor.scala
diff --git a/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/actor b/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/actor
index a2141db8a9..386928c5a8 100644
--- a/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/actor
+++ b/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/actor
@@ -1 +1 @@
-class=se.scalablesolutions.akka.camel.component.ActorComponent
\ No newline at end of file
+class=akka.camel.component.ActorComponent
\ No newline at end of file
diff --git a/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/typed-actor b/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/typed-actor
index e004d887b3..02efe457e6 100644
--- a/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/typed-actor
+++ b/akka-camel/src/main/resources/META-INF/services/org/apache/camel/component/typed-actor
@@ -1 +1 @@
-class=se.scalablesolutions.akka.camel.component.TypedActorComponent
\ No newline at end of file
+class=akka.camel.component.TypedActorComponent
\ No newline at end of file
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/MessageJavaTestBase.java b/akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/MessageJavaTestBase.java
rename to akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleRemoteTypedConsumer.java b/akka-camel/src/test/java/akka/camel/SampleRemoteTypedConsumer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleRemoteTypedConsumer.java
rename to akka-camel/src/test/java/akka/camel/SampleRemoteTypedConsumer.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleRemoteTypedConsumerImpl.java b/akka-camel/src/test/java/akka/camel/SampleRemoteTypedConsumerImpl.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleRemoteTypedConsumerImpl.java
rename to akka-camel/src/test/java/akka/camel/SampleRemoteTypedConsumerImpl.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleRemoteUntypedConsumer.java b/akka-camel/src/test/java/akka/camel/SampleRemoteUntypedConsumer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleRemoteUntypedConsumer.java
rename to akka-camel/src/test/java/akka/camel/SampleRemoteUntypedConsumer.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActor.java b/akka-camel/src/test/java/akka/camel/SampleTypedActor.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActor.java
rename to akka-camel/src/test/java/akka/camel/SampleTypedActor.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActorImpl.java b/akka-camel/src/test/java/akka/camel/SampleTypedActorImpl.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActorImpl.java
rename to akka-camel/src/test/java/akka/camel/SampleTypedActorImpl.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedConsumer.java b/akka-camel/src/test/java/akka/camel/SampleTypedConsumer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedConsumer.java
rename to akka-camel/src/test/java/akka/camel/SampleTypedConsumer.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedConsumerImpl.java b/akka-camel/src/test/java/akka/camel/SampleTypedConsumerImpl.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedConsumerImpl.java
rename to akka-camel/src/test/java/akka/camel/SampleTypedConsumerImpl.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumer.java b/akka-camel/src/test/java/akka/camel/SampleTypedSingleConsumer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumer.java
rename to akka-camel/src/test/java/akka/camel/SampleTypedSingleConsumer.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumerImpl.java b/akka-camel/src/test/java/akka/camel/SampleTypedSingleConsumerImpl.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumerImpl.java
rename to akka-camel/src/test/java/akka/camel/SampleTypedSingleConsumerImpl.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedActor.java b/akka-camel/src/test/java/akka/camel/SampleUntypedActor.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedActor.java
rename to akka-camel/src/test/java/akka/camel/SampleUntypedActor.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumer.java
rename to akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumerBlocking.java b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumerBlocking.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumerBlocking.java
rename to akka-camel/src/test/java/akka/camel/SampleUntypedConsumerBlocking.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedForwardingProducer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedForwardingProducer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedForwardingProducer.java
rename to akka-camel/src/test/java/akka/camel/SampleUntypedForwardingProducer.java
diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedReplyingProducer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedReplyingProducer.java
similarity index 100%
rename from akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedReplyingProducer.java
rename to akka-camel/src/test/java/akka/camel/SampleUntypedReplyingProducer.java
diff --git a/akka-samples/akka-sample-ants/src/main/spde/Ants.spde b/akka-samples/akka-sample-ants/src/main/spde/Ants.spde
index 05565673d6..ad7dce1239 100644
--- a/akka-samples/akka-sample-ants/src/main/spde/Ants.spde
+++ b/akka-samples/akka-sample-ants/src/main/spde/Ants.spde
@@ -1,6 +1,6 @@
 import sample.ants._
 import sample.ants.Config._
-import se.scalablesolutions.akka.stm.local._
+import akka.stm.local._
 
 val scale = 5
 
diff --git a/akka-spring/src/main/resources/META-INF/spring.handlers b/akka-spring/src/main/resources/META-INF/spring.handlers
index 9e8b198496..0812c4dd2e 100644
--- a/akka-spring/src/main/resources/META-INF/spring.handlers
+++ b/akka-spring/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.akkasource.org/schema/akka=se.scalablesolutions.akka.spring.AkkaNamespaceHandler
+http\://www.akkasource.org/schema/akka=akka.spring.AkkaNamespaceHandler
diff --git a/akka-spring/src/main/resources/META-INF/spring.schemas b/akka-spring/src/main/resources/META-INF/spring.schemas
index 4879dc82a4..37ec717596 100644
--- a/akka-spring/src/main/resources/META-INF/spring.schemas
+++ b/akka-spring/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://scalablesolutions.se/akka/akka-1.0-SNAPSHOT.xsd=se/scalablesolutions/akka/spring/akka-1.0-SNAPSHOT.xsd
+http\://scalablesolutions.se/akka/akka-1.0-SNAPSHOT.xsd=akka/spring/akka-1.0-SNAPSHOT.xsd
diff --git a/akka-spring/src/main/resources/se/scalablesolutions/akka/spring/akka-0.10.xsd b/akka-spring/src/main/resources/akka/spring/akka-0.10.xsd
similarity index 100%
rename from akka-spring/src/main/resources/se/scalablesolutions/akka/spring/akka-0.10.xsd
rename to akka-spring/src/main/resources/akka/spring/akka-0.10.xsd
diff --git a/akka-spring/src/main/resources/se/scalablesolutions/akka/spring/akka-1.0-SNAPSHOT.xsd b/akka-spring/src/main/resources/akka/spring/akka-1.0-SNAPSHOT.xsd
similarity index 100%
rename from akka-spring/src/main/resources/se/scalablesolutions/akka/spring/akka-1.0-SNAPSHOT.xsd
rename to akka-spring/src/main/resources/akka/spring/akka-1.0-SNAPSHOT.xsd