diff --git a/README.md b/README.md
index 550b250..a38af31 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Jars and sources are available in our Maven repositories:
 To use SoftwareMill Common in a project define a parent section in the main pom of the project:
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-parent</artifactId>
         <version>[VERSION]</version>
     </parent>
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index ff4dc82..4a42136 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -4,58 +4,58 @@
     <!-- Bug codes and descriptions: http://findbugs.sourceforge.net/bugDescriptions.html-->
 
 	<Match>
-       	<Class name="pl.softwaremill.common.test.web.selenium.AbstractSeleniumTest" />
+       	<Class name="com.softwaremill.common.test.web.selenium.AbstractSeleniumTest" />
 		<Mehtod name="setupBrowser"/>
        	<Bug code="ST"/>
     </Match>
 
 	<Match>
-       	<Class name="pl.softwaremill.common.test.web.selenium.AbstractSeleniumTest" />
+       	<Class name="com.softwaremill.common.test.web.selenium.AbstractSeleniumTest" />
 		<Field name="selenium"/>
        	<Bug code="MS"/>
     </Match>
     <Match>
-       	<Class name="pl.softwaremill.common.sqs.util.EmailDescription" />
+       	<Class name="com.softwaremill.common.sqs.util.EmailDescription" />
 		<Field name="emails"/>
        	<Bug code="EI2"/>
     </Match>
     <Match>
-       	<Class name="pl.softwaremill.common.sqs.util.EmailDescription" />
+       	<Class name="com.softwaremill.common.sqs.util.EmailDescription" />
 		<Method name="getEmails"/>
        	<Bug code="EI"/>
     </Match>
     <Match>
-       	<Class name="pl.softwaremill.common.sqs.util.EmailDescription" />
+       	<Class name="com.softwaremill.common.sqs.util.EmailDescription" />
 		<Field name="replyToEmails"/>
        	<Bug code="EI2"/>
     </Match>
     <Match>
-       	<Class name="pl.softwaremill.common.sqs.util.EmailDescription" />
+       	<Class name="com.softwaremill.common.sqs.util.EmailDescription" />
 		<Method name="getReplyToEmails"/>
        	<Bug code="EI"/>
     </Match>
     <Match>
-       	<Class name="pl.softwaremill.common.sqs.SQSEmptor" />
+       	<Class name="com.softwaremill.common.sqs.SQSEmptor" />
 		<Method name="main"/>
        	<Bug code="NP"/>
     </Match>
 	<Match>
-       	<Class name="pl.softwaremill.common.util.InfiniteSleeper" />
+       	<Class name="com.softwaremill.common.util.InfiniteSleeper" />
 		<Method name="sleepInfinitely"/>
        	<Bug code="UW, Wa"/>
     </Match>
     <Match>
-        <Class name="pl.softwaremill.common.cdi.security.SecurityExtension" />
+        <Class name="com.softwaremill.common.cdi.security.SecurityExtension" />
         <Field name="interceptSecureForMethods"/>
         <Bug code="Se"/>
     </Match>
     <Match>
-        <Class name="pl.softwaremill.common.faces.messages.FacesMessages" />
+        <Class name="com.softwaremill.common.faces.messages.FacesMessages" />
         <Field name="elEvaluator"/>
         <Bug code="Se"/>
     </Match>
     <Match>
-        <Class name="pl.softwaremill.common.faces.messages.FacesMessages" />
+        <Class name="com.softwaremill.common.faces.messages.FacesMessages" />
         <Field name="messages"/>
         <Bug code="Se"/>
     </Match>
diff --git a/pom.xml b/pom.xml
index eeaff34..df169b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>pl.softwaremill.common</groupId>
+    <groupId>com.softwaremill.common</groupId>
     <artifactId>softwaremill-common-parent</artifactId>
     <version>74-SNAPSHOT</version>
     <name>Softwaremill Common Parent</name>
diff --git a/softwaremill-backup/pom.xml b/softwaremill-backup/pom.xml
index 1afe972..c26f3ee 100644
--- a/softwaremill-backup/pom.xml
+++ b/softwaremill-backup/pom.xml
@@ -6,7 +6,7 @@
 	<name>Softwaremill backup utilities</name>
 
 	<parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -40,13 +40,13 @@
         </dependency>
 
 		<dependency>
-			<groupId>pl.softwaremill.common</groupId>
+			<groupId>com.softwaremill.common</groupId>
 			<artifactId>softwaremill-conf</artifactId>
             <scope>test</scope>
             <version>${project.version}</version>
 		</dependency>
         <dependency>
-			<groupId>pl.softwaremill.common</groupId>
+			<groupId>com.softwaremill.common</groupId>
 			<artifactId>softwaremill-util</artifactId>
             <version>${project.version}</version>
 		</dependency>
@@ -82,7 +82,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>pl.softwaremill.common.backup.RunBackup</mainClass>
+                            <mainClass>com.softwaremill.common.backup.RunBackup</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
diff --git a/softwaremill-backup/scripts/backup_mysql_and_upload.sh b/softwaremill-backup/scripts/backup_mysql_and_upload.sh
index 0ff8086..5fdaee0 100644
--- a/softwaremill-backup/scripts/backup_mysql_and_upload.sh
+++ b/softwaremill-backup/scripts/backup_mysql_and_upload.sh
@@ -32,7 +32,7 @@ tar -czf $TAR_FILE_NAME $DUMP_FILE_NAME
 rm $DUMP_FILE_NAME
 
 # Uploading to S3
-java -cp $SDB_BACKUP_PATH pl.softwaremill.common.backup.S3Upload $S3_ACCESS_KEY_ID $S3_SECRET_ACCESS_KEY $S3_BUCKET $TAR_FILE_NAME $S3_PREFIX$CURRENT_YEAR_MONTH
+java -cp $SDB_BACKUP_PATH com.softwaremill.common.backup.S3Upload $S3_ACCESS_KEY_ID $S3_SECRET_ACCESS_KEY $S3_BUCKET $TAR_FILE_NAME $S3_PREFIX$CURRENT_YEAR_MONTH
 
 # Cleaning up
 rm $TAR_FILE_NAME
\ No newline at end of file
diff --git a/softwaremill-backup/scripts/backup_sdb_and_upload.sh b/softwaremill-backup/scripts/backup_sdb_and_upload.sh
index 4c4f8a6..37899d9 100644
--- a/softwaremill-backup/scripts/backup_sdb_and_upload.sh
+++ b/softwaremill-backup/scripts/backup_sdb_and_upload.sh
@@ -27,7 +27,7 @@ tar -czf $TAR_FILE_NAME simpledb_backup*${CURRENT_DATE}*.txt
 rm simpledb_backup*${CURRENT_DATE}*.txt
 
 # Uploading to S3
-java -cp $SDB_BACKUP_PATH pl.softwaremill.common.backup.S3Upload $S3_ACCESS_KEY_ID $S3_SECRET_ACCESS_KEY $S3_BUCKET $TAR_FILE_NAME $S3_PREFIX$CURRENT_YEAR_MONTH
+java -cp $SDB_BACKUP_PATH com.softwaremill.common.backup.S3Upload $S3_ACCESS_KEY_ID $S3_SECRET_ACCESS_KEY $S3_BUCKET $TAR_FILE_NAME $S3_PREFIX$CURRENT_YEAR_MONTH
 
 # Cleaning up
 rm $TAR_FILE_NAME
diff --git a/softwaremill-backup/scripts/restore_sdb.sh b/softwaremill-backup/scripts/restore_sdb.sh
index 381cea5..090e5f2 100755
--- a/softwaremill-backup/scripts/restore_sdb.sh
+++ b/softwaremill-backup/scripts/restore_sdb.sh
@@ -14,4 +14,4 @@ source backup_conf.sh
 #########
 
 # Creating backup files
-java -cp $SDB_BACKUP_PATH pl.softwaremill.common.backup.RunRestore $SIMPLEDB_ACCESS_KEY_ID $SIMPLEDB_SECRET_ACCESS_KEY $SIMPLEDB_REGION $1 $2
+java -cp $SDB_BACKUP_PATH com.softwaremill.common.backup.RunRestore $SIMPLEDB_ACCESS_KEY_ID $SIMPLEDB_SECRET_ACCESS_KEY $SIMPLEDB_REGION $1 $2
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainBackup.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainBackup.java
index 2d99738..b844cb6 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainBackup.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainBackup.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainRestore.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainRestore.java
index 2a08bce..be1f2f3 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainRestore.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/DomainRestore.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONAttribute.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONAttribute.java
index f32191a..eaf3249 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONAttribute.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONAttribute.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import java.util.Set;
 
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONItem.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONItem.java
index 1693037..d44a409 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONItem.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/JSONItem.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.xerox.amazonws.simpledb.Item;
 
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunBackup.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunBackup.java
index d5af9f1..4b3b89c 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunBackup.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunBackup.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.google.common.base.Charsets;
 import com.xerox.amazonws.simpledb.Domain;
@@ -7,7 +7,7 @@
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.DateTimeFormatterBuilder;
-import pl.softwaremill.common.util.RichString;
+import com.softwaremill.common.util.RichString;
 
 import java.io.*;
 import java.util.ArrayList;
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunRestore.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunRestore.java
index 6937b95..c0bc1e4 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunRestore.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/RunRestore.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.google.common.base.Charsets;
 import com.xerox.amazonws.simpledb.SDBException;
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/S3Upload.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/S3Upload.java
index 45f8f54..9b8f68f 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/S3Upload.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/S3Upload.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.impl.rest.httpclient.RestS3Service;
diff --git a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/SimpleDBRegion.java b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/SimpleDBRegion.java
index 54b44ed..32f77bc 100644
--- a/softwaremill-backup/src/main/java/com/softwaremill/common/backup/SimpleDBRegion.java
+++ b/softwaremill-backup/src/main/java/com/softwaremill/common/backup/SimpleDBRegion.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-backup/src/test/java/com/softwaremill/common/backup/AbstractBackupAndRestoreTest.java b/softwaremill-backup/src/test/java/com/softwaremill/common/backup/AbstractBackupAndRestoreTest.java
index db13b62..f751834 100644
--- a/softwaremill-backup/src/test/java/com/softwaremill/common/backup/AbstractBackupAndRestoreTest.java
+++ b/softwaremill-backup/src/test/java/com/softwaremill/common/backup/AbstractBackupAndRestoreTest.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.xerox.amazonws.simpledb.*;
 import org.testng.annotations.BeforeClass;
-import pl.softwaremill.common.conf.Configuration;
+import com.softwaremill.common.conf.Configuration;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/softwaremill-backup/src/test/java/com/softwaremill/common/backup/StressTestBackupAndRestore.java b/softwaremill-backup/src/test/java/com/softwaremill/common/backup/StressTestBackupAndRestore.java
index 1a01611..10917ab 100644
--- a/softwaremill-backup/src/test/java/com/softwaremill/common/backup/StressTestBackupAndRestore.java
+++ b/softwaremill-backup/src/test/java/com/softwaremill/common/backup/StressTestBackupAndRestore.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.google.common.collect.ImmutableMap;
 import com.xerox.amazonws.simpledb.Domain;
@@ -6,7 +6,7 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.util.RichString;
+import com.softwaremill.common.util.RichString;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/softwaremill-backup/src/test/java/com/softwaremill/common/backup/TestBackupAndRestore.java b/softwaremill-backup/src/test/java/com/softwaremill/common/backup/TestBackupAndRestore.java
index 815edd6..0c23338 100644
--- a/softwaremill-backup/src/test/java/com/softwaremill/common/backup/TestBackupAndRestore.java
+++ b/softwaremill-backup/src/test/java/com/softwaremill/common/backup/TestBackupAndRestore.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.backup;
+package com.softwaremill.common.backup;
 
 import com.google.common.collect.ImmutableMap;
 import com.xerox.amazonws.simpledb.Domain;
diff --git a/softwaremill-cdi/README.md b/softwaremill-cdi/README.md
index 88c961b..8eb5229 100644
--- a/softwaremill-cdi/README.md
+++ b/softwaremill-cdi/README.md
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-cdi</artifactId>
         <version>VERSION</version>
     </dependency>
@@ -46,8 +46,8 @@ the `@AllowWithFlag` annotation. To run code in the privileged, "flagged" mode d
 To use, add to your beans.xml the following:
 
     <interceptors>
-        <class>pl.softwaremill.common.cdi.security.SecurityInterceptor</class>
-        <class>pl.softwaremill.common.cdi.security.SecurityResultInterceptor</class>
+        <class>com.softwaremill.common.cdi.security.SecurityInterceptor</class>
+        <class>com.softwaremill.common.cdi.security.SecurityResultInterceptor</class>
     </interceptors>
 
 Blog links:
@@ -180,7 +180,7 @@ scope of a JSF request, and the TX isn't managed by the container (e.g. remoting
 To enable, add to beans.xml:
 
     <interceptors>
-        <class>pl.softwaremill.common.cdi.transaction.TransactionalInterceptor</class>
+        <class>com.softwaremill.common.cdi.transaction.TransactionalInterceptor</class>
     </interceptors>
 
 ## TransactionTimeout interceptor
@@ -191,7 +191,7 @@ Use the `@TransactionTimeout(timeout = SECONDS)` on a method or type to prolong
 To enable, add to beans.xml:
 
     <interceptors>
-        <class>pl.softwaremill.common.cdi.transaction.TransactionTimeoutInterceptor</class>
+        <class>com.softwaremill.common.cdi.transaction.TransactionTimeoutInterceptor</class>
     </interceptors>
 
 Because the tx timeout must be specified *before* the transaction is started, make sure to specify the
diff --git a/softwaremill-cdi/pom.xml b/softwaremill-cdi/pom.xml
index 78cbdfc..7db45e9 100644
--- a/softwaremill-cdi/pom.xml
+++ b/softwaremill-cdi/pom.xml
@@ -5,7 +5,7 @@
     <name>Softwaremill CDI Extensions</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -13,12 +13,12 @@
     <dependencies>
         <!-- Inter-modules dependencies -->
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-util</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-conf</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -89,7 +89,7 @@
 
         <!-- Arquillian -->
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-test-arquillian</artifactId>
             <scope>test</scope>
             <version>${project.version}</version>
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/CreatedWith.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/CreatedWith.java
index 0c16a18..ca18765 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/CreatedWith.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/CreatedWith.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/FactoryParameter.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/FactoryParameter.java
index 3a258da..3e2692c 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/FactoryParameter.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/FactoryParameter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryBean.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryBean.java
index 448ad8c..33d5d94 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryBean.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
 import org.jboss.weld.literal.DefaultLiteral;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryExtension.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryExtension.java
index b95272a..c6ea397 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryExtension.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryExtension.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.*;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryFromCreatedWithCreator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryFromCreatedWithCreator.java
index 595afb7..e937b88 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryFromCreatedWithCreator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/AutoFactoryFromCreatedWithCreator.java
@@ -1,15 +1,15 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.manager.SimpleInjectionTarget;
 import org.jboss.weld.resources.ClassTransformer;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.converter.ConstructorToParameterValuesConverter;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.converter.FactoryParameterOnlyConstructorConverter;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.converter.MixedConstructorConverter;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.converter.ConstructorToParameterValuesConverter;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.converter.FactoryParameterOnlyConstructorConverter;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.converter.MixedConstructorConverter;
 
 import javax.annotation.Nullable;
 import javax.enterprise.inject.spi.*;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/CreatedTypeData.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/CreatedTypeData.java
index 6de8867..da009c8 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/CreatedTypeData.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/CreatedTypeData.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.InjectionTarget;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/FactoryInvocationHandler.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/FactoryInvocationHandler.java
index 3c84c71..cfa60ea 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/FactoryInvocationHandler.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/FactoryInvocationHandler.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
 import org.jboss.weld.Container;
 import org.jboss.weld.injection.ConstructorInjectionPoint;
 import org.jboss.weld.injection.CurrentInjectionPoint;
 import org.jboss.weld.introspector.WeldConstructor;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/MethodParameterIndexer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/MethodParameterIndexer.java
index f4572a4..93ca1ee 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/MethodParameterIndexer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/MethodParameterIndexer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/QualifierAnnotationsFilter.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/QualifierAnnotationsFilter.java
index dfdd126..1c3d76d 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/QualifierAnnotationsFilter.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/QualifierAnnotationsFilter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.extension;
+package com.softwaremill.common.cdi.autofactory.extension;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/BeanManagerParameterValue.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/BeanManagerParameterValue.java
index 1bb166c..9846079 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/BeanManagerParameterValue.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/BeanManagerParameterValue.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.cdi.autofactory.extension.parameter;
+package com.softwaremill.common.cdi.autofactory.extension.parameter;
 
 import org.jboss.weld.Container;
 import org.jboss.weld.injection.ConstructorInjectionPoint;
 import org.jboss.weld.injection.CurrentInjectionPoint;
 import org.jboss.weld.injection.ParameterInjectionPoint;
-import pl.softwaremill.common.cdi.util.BeanInject;
+import com.softwaremill.common.cdi.util.BeanInject;
 
 import javax.enterprise.inject.spi.BeanManager;
 import java.lang.annotation.Annotation;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/FactoryParameterParameterValue.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/FactoryParameterParameterValue.java
index 4aab9a9..377834c 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/FactoryParameterParameterValue.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/FactoryParameterParameterValue.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.extension.parameter;
+package com.softwaremill.common.cdi.autofactory.extension.parameter;
 
 import javax.enterprise.inject.spi.BeanManager;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/ParameterValue.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/ParameterValue.java
index 226205e..f64740d 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/ParameterValue.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/ParameterValue.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.extension.parameter;
+package com.softwaremill.common.cdi.autofactory.extension.parameter;
 
 import javax.enterprise.inject.spi.BeanManager;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/ConstructorToParameterValuesConverter.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/ConstructorToParameterValuesConverter.java
index 8f6df15..b0815f6 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/ConstructorToParameterValuesConverter.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/ConstructorToParameterValuesConverter.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.autofactory.extension.parameter.converter;
+package com.softwaremill.common.cdi.autofactory.extension.parameter.converter;
 
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/FactoryParameterOnlyConstructorConverter.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/FactoryParameterOnlyConstructorConverter.java
index bc60460..5570115 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/FactoryParameterOnlyConstructorConverter.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/FactoryParameterOnlyConstructorConverter.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.cdi.autofactory.extension.parameter.converter;
+package com.softwaremill.common.cdi.autofactory.extension.parameter.converter;
 
-import pl.softwaremill.common.cdi.autofactory.extension.MethodParameterIndexer;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.FactoryParameterParameterValue;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.MethodParameterIndexer;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.FactoryParameterParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedParameter;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/MixedConstructorConverter.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/MixedConstructorConverter.java
index e80eaa3..ba8a955 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/MixedConstructorConverter.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/autofactory/extension/parameter/converter/MixedConstructorConverter.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.autofactory.extension.parameter.converter;
-
-import pl.softwaremill.common.cdi.autofactory.FactoryParameter;
-import pl.softwaremill.common.cdi.autofactory.extension.MethodParameterIndexer;
-import pl.softwaremill.common.cdi.autofactory.extension.QualifierAnnotationsFilter;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.BeanManagerParameterValue;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.FactoryParameterParameterValue;
-import pl.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
+package com.softwaremill.common.cdi.autofactory.extension.parameter.converter;
+
+import com.softwaremill.common.cdi.autofactory.FactoryParameter;
+import com.softwaremill.common.cdi.autofactory.extension.MethodParameterIndexer;
+import com.softwaremill.common.cdi.autofactory.extension.QualifierAnnotationsFilter;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.BeanManagerParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.FactoryParameterParameterValue;
+import com.softwaremill.common.cdi.autofactory.extension.parameter.ParameterValue;
 
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedParameter;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValue.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValue.java
index 7dcdeaf..778f77d 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValue.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValue.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.conf;
+package com.softwaremill.common.cdi.conf;
 
 import javax.enterprise.util.Nonbinding;
 import javax.inject.Qualifier;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValueProducer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValueProducer.java
index a1ca23b..86f18eb 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValueProducer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/conf/ConfValueProducer.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.conf;
+package com.softwaremill.common.cdi.conf;
 
-import pl.softwaremill.common.conf.Configuration;
+import com.softwaremill.common.conf.Configuration;
 
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.InjectionPoint;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/ConfigExtension.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/ConfigExtension.java
index 7152ff2..990d1a2 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/ConfigExtension.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/ConfigExtension.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.config;
+package com.softwaremill.common.cdi.config;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.event.Observes;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/Configuration.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/Configuration.java
index c091feb..9a0f6d0 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/Configuration.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/config/Configuration.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.config;
+package com.softwaremill.common.cdi.config;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/AbstractELEvaluator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/AbstractELEvaluator.java
index 7a494c0..b17415f 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/AbstractELEvaluator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/AbstractELEvaluator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import java.util.Map;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluator.java
index e794140..e9697ac 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import java.util.Map;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorProducer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorProducer.java
index 180e6d8..4e9fdc3 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorProducer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorProducer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorUtil.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorUtil.java
index 4bfb32f..1a7d722 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorUtil.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/ELEvaluatorUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/FacesContextELEvaluator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/FacesContextELEvaluator.java
index 5549502..da939e0 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/FacesContextELEvaluator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/FacesContextELEvaluator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import javax.el.ELContext;
 import javax.faces.context.FacesContext;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/TemporaryContextELEvaluator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/TemporaryContextELEvaluator.java
index 6409e58..55f2182 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/TemporaryContextELEvaluator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/el/TemporaryContextELEvaluator.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
-import pl.softwaremill.common.util.ClassUtil;
+import com.softwaremill.common.util.ClassUtil;
 
 import javax.el.*;
 import javax.enterprise.inject.spi.BeanManager;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParams.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParams.java
index 298ab57..95d2bea 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParams.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParams.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.interceptor;
+package com.softwaremill.common.cdi.interceptor;
 
 import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsInterceptor.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsInterceptor.java
index 467e879..a1fb818 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsInterceptor.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsInterceptor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.interceptor;
+package com.softwaremill.common.cdi.interceptor;
 
 import com.google.common.base.Strings;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/logger/LoggerProducer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/logger/LoggerProducer.java
index 78d94ef..3a8a743 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/logger/LoggerProducer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/logger/LoggerProducer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.logger;
+package com.softwaremill.common.cdi.logger;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OS.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OS.java
index ed3514a..ab525f3 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OS.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OS.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * A marker interface for services for particular type of objects.
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OSP.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OSP.java
index e729881..035e44d 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OSP.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/OSP.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 import java.io.Serializable;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSBean.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSBean.java
index 61042e9..1afbf0f 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSBean.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import org.jboss.weld.literal.DefaultLiteral;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSException.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSException.java
index 2d6b6dc..ec5627c 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSException.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSException.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 public class AutoOSException extends RuntimeException {
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSInvocationHandler.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSInvocationHandler.java
index 4a36281..cfdeefb 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSInvocationHandler.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoOSInvocationHandler.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
-import pl.softwaremill.common.cdi.objectservice.extension.ObjectServiceSpecification;
-import pl.softwaremill.common.util.dependency.BeanManagerDependencyProvider;
+import com.softwaremill.common.cdi.objectservice.extension.ObjectServiceSpecification;
+import com.softwaremill.common.util.dependency.BeanManagerDependencyProvider;
 
 import javax.enterprise.inject.spi.BeanManager;
 import java.lang.reflect.InvocationHandler;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoObjectServiceExtension.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoObjectServiceExtension.java
index ddd9f78..80061bf 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoObjectServiceExtension.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/AutoObjectServiceExtension.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OS.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OS.java
index dfb206a..89775dc 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OS.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OS.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OSImpl.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OSImpl.java
index b5dd296..32b48f0 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OSImpl.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/auto/OSImpl.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/OSPImpl.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/OSPImpl.java
index a1410b5..ba56ee8 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/OSPImpl.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/OSPImpl.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.objectservice.extension;
+package com.softwaremill.common.cdi.objectservice.extension;
 
-import pl.softwaremill.common.cdi.objectservice.OS;
-import pl.softwaremill.common.cdi.objectservice.OSP;
+import com.softwaremill.common.cdi.objectservice.OS;
+import com.softwaremill.common.cdi.objectservice.OSP;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceExtension.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceExtension.java
index fb17f6e..c041f84 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceExtension.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceExtension.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.cdi.objectservice.extension;
+package com.softwaremill.common.cdi.objectservice.extension;
 
 import org.jboss.weld.util.reflection.HierarchyDiscovery;
 import org.jboss.weld.util.reflection.ParameterizedTypeImpl;
-import pl.softwaremill.common.cdi.objectservice.OS;
+import com.softwaremill.common.cdi.objectservice.OS;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.*;
@@ -59,7 +59,7 @@ public Set<Type> getInterfaceClosure(Class<?> rawType) {
     }
 
     /**
-     * Looks for the type parameter of the given annotated type, which has a raw type {@link pl.softwaremill.common.cdi.objectservice.OS}.
+     * Looks for the type parameter of the given annotated type, which has a raw type {@link com.softwaremill.common.cdi.objectservice.OS}.
      * @param at The class on which to look for the type parameter.
      * @return The type parameter or {@code null}, if no type parameter is specified.
      */
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceProviderBean.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceProviderBean.java
index 2467729..36f3dee 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceProviderBean.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceProviderBean.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.cdi.objectservice.extension;
+package com.softwaremill.common.cdi.objectservice.extension;
 
 import org.jboss.weld.literal.DefaultLiteral;
 import org.jboss.weld.util.reflection.ParameterizedTypeImpl;
-import pl.softwaremill.common.cdi.objectservice.OSP;
+import com.softwaremill.common.cdi.objectservice.OSP;
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.CreationalContext;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceSpecification.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceSpecification.java
index d3fe3f1..6eb4d7b 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceSpecification.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/ObjectServiceSpecification.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.extension;
+package com.softwaremill.common.cdi.objectservice.extension;
 
 import java.io.Serializable;
 import java.lang.reflect.Type;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/PureWildcardType.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/PureWildcardType.java
index 02bc701..cbc4eee 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/PureWildcardType.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/objectservice/extension/PureWildcardType.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.extension;
+package com.softwaremill.common.cdi.objectservice.extension;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerFactoryProducer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerFactoryProducer.java
index 7436bcb..372ac76 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerFactoryProducer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerFactoryProducer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerProducer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerProducer.java
index 8c2a54c..464f960 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerProducer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerProducer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Disposes;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerTxEnlistDecorator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerTxEnlistDecorator.java
index 94b0dfe..93ecc25 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerTxEnlistDecorator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerTxEnlistDecorator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.persistence.*;
 import javax.persistence.criteria.CriteriaBuilder;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerUtil.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerUtil.java
index cf13dad..b9de929 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerUtil.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityManagerUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityWriter.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityWriter.java
index dcb5d88..e960254 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityWriter.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/EntityWriter.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import org.hibernate.proxy.HibernateProxy;
-import pl.softwaremill.common.util.persistance.Identifiable;
+import com.softwaremill.common.util.persistance.Identifiable;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/QueryCreator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/QueryCreator.java
index d33d487..5a01c20 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/QueryCreator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/QueryCreator.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
 /**
  * Creates a query. Can be used to properly execute bulk update queries using
- * {@link pl.softwaremill.common.cdi.persistence.EntityWriter#executeUpdate(QueryCreator)}.
+ * {@link com.softwaremill.common.cdi.persistence.EntityWriter#executeUpdate(QueryCreator)}.
  * @author Adam Warski (adam at warski dot org)
  */
 public interface QueryCreator {
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/ReadOnly.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/ReadOnly.java
index 16a83b8..a764539 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/ReadOnly.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/ReadOnly.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/Writeable.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/Writeable.java
index ed30be5..d1892a2 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/Writeable.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/persistence/Writeable.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/AllowWithFlag.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/AllowWithFlag.java
index aa82ca6..c4c7c6a 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/AllowWithFlag.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/AllowWithFlag.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/InterceptSecure.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/InterceptSecure.java
index 7f33255..cd15910 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/InterceptSecure.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/InterceptSecure.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import javax.enterprise.util.Nonbinding;
 import javax.interceptor.InterceptorBinding;
@@ -8,7 +8,7 @@
 import java.lang.annotation.Target;
 
 /**
- * The annotation the is generated by the {@link pl.softwaremill.common.cdi.security.SecurityExtension}, which contains
+ * The annotation the is generated by the {@link com.softwaremill.common.cdi.security.SecurityExtension}, which contains
  * all security constraints to be checked.
  * @author Adam Warski (adam at warski dot org)
  */
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/LoginBean.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/LoginBean.java
index 9f09323..cd5b569 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/LoginBean.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/LoginBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * Should be implemented by the bean which controls the logged-in status of the user.
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/Secure.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/Secure.java
index 3ca6ccd..b7cb3e9 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/Secure.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/Secure.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureBinding.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureBinding.java
index 82a1e28..61f40fb 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureBinding.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureBinding.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureResult.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureResult.java
index b02e296..9f60abe 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureResult.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureResult.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import javax.enterprise.util.Nonbinding;
 import javax.interceptor.InterceptorBinding;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureVar.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureVar.java
index 1550172..70e238a 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureVar.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecureVar.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityConditionException.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityConditionException.java
index 2d1b6d0..b52d783 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityConditionException.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityConditionException.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityExtension.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityExtension.java
index 3c85db7..7abf5a3 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityExtension.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityExtension.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import org.jboss.solder.reflection.annotated.AnnotatedTypeBuilder;
 
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityFlags.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityFlags.java
index 9471c38..99cd15d 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityFlags.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityFlags.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import javax.enterprise.inject.Model;
 import java.io.Serializable;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityInterceptor.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityInterceptor.java
index eb86a1f..4d95b73 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityInterceptor.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityInterceptor.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import com.google.common.collect.ImmutableMap;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.cdi.el.ELEvaluator;
 
 import javax.inject.Inject;
 import javax.interceptor.AroundInvoke;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityResultInterceptor.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityResultInterceptor.java
index 0587a84..83566f6 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityResultInterceptor.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/security/SecurityResultInterceptor.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import com.google.common.collect.ImmutableMap;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.cdi.el.ELEvaluator;
 
 import javax.inject.Inject;
 import javax.interceptor.AroundInvoke;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemProperty.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemProperty.java
index 003aa24..f5de36d 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemProperty.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemProperty.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.sysprops;
+package com.softwaremill.common.cdi.sysprops;
 
 import javax.enterprise.util.Nonbinding;
 import javax.inject.Qualifier;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducer.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducer.java
index e6374e6..faae0ea 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducer.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.sysprops;
+package com.softwaremill.common.cdi.sysprops;
 
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.InjectionPoint;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeout.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeout.java
index 4af5e44..b2fd49e 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeout.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeout.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.transaction;
+package com.softwaremill.common.cdi.transaction;
 
 import javax.enterprise.util.Nonbinding;
 import javax.interceptor.InterceptorBinding;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeoutInterceptor.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeoutInterceptor.java
index fd71a34..0a47439 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeoutInterceptor.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionTimeoutInterceptor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.transaction;
+package com.softwaremill.common.cdi.transaction;
 
 import javax.annotation.Resource;
 import javax.interceptor.AroundInvoke;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/Transactional.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/Transactional.java
index 1675ecb..e2718f1 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/Transactional.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/Transactional.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.transaction;
+package com.softwaremill.common.cdi.transaction;
 
 import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.*;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionalInterceptor.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionalInterceptor.java
index 21c61c4..a972ca6 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionalInterceptor.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/transaction/TransactionalInterceptor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.transaction;
+package com.softwaremill.common.cdi.transaction;
 
 import org.slf4j.Logger;
 
@@ -12,7 +12,7 @@
 import java.io.Serializable;
 
 /**
- * An interceptor for the {@link pl.softwaremill.common.cdi.transaction.Transactional} annotation.
+ * An interceptor for the {@link com.softwaremill.common.cdi.transaction.Transactional} annotation.
  *
  * @author Adam Warski (adam at warski dot org)
  * @link http://smokeandice.blogspot.com/2009/12/cdi-and-declarative-transactions.html
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/util/BeanInject.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/util/BeanInject.java
index df43a3b..85b8fab 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/util/BeanInject.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/util/BeanInject.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.util;
+package com.softwaremill.common.cdi.util;
 
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Length.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Length.java
index 252bdff..dfcc272 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Length.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Length.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validation;
+package com.softwaremill.common.cdi.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/LengthValidator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/LengthValidator.java
index 86e18df..9a57094 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/LengthValidator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/LengthValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validation;
+package com.softwaremill.common.cdi.validation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialChars.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialChars.java
index 138dc8d..ea6270a 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialChars.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialChars.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validation;
+package com.softwaremill.common.cdi.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialCharsValidator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialCharsValidator.java
index 2bdb4f3..4036549 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialCharsValidator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/NoSpecialCharsValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validation;
+package com.softwaremill.common.cdi.validation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Password.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Password.java
index 8672a45..5983481 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Password.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/Password.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validation;
+package com.softwaremill.common.cdi.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/PasswordValidator.java b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/PasswordValidator.java
index ba993b4..5ef0718 100644
--- a/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/PasswordValidator.java
+++ b/softwaremill-cdi/src/main/java/com/softwaremill/common/cdi/validation/PasswordValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validation;
+package com.softwaremill.common.cdi.validation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/softwaremill-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/softwaremill-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 193e435..4b4690a 100644
--- a/softwaremill-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/softwaremill-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1,5 +1,5 @@
-pl.softwaremill.common.cdi.security.SecurityExtension
-pl.softwaremill.common.cdi.config.ConfigExtension
-pl.softwaremill.common.cdi.objectservice.extension.ObjectServiceExtension
-pl.softwaremill.common.cdi.autofactory.extension.AutoFactoryExtension
-pl.softwaremill.common.cdi.objectservice.auto.AutoObjectServiceExtension
+com.softwaremill.common.cdi.security.SecurityExtension
+com.softwaremill.common.cdi.config.ConfigExtension
+com.softwaremill.common.cdi.objectservice.extension.ObjectServiceExtension
+com.softwaremill.common.cdi.autofactory.extension.AutoFactoryExtension
+com.softwaremill.common.cdi.objectservice.auto.AutoObjectServiceExtension
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/AbstractAutoFactoryTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/AbstractAutoFactoryTest.java
index 8c0ef14..dc2f5d7 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/AbstractAutoFactoryTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/AbstractAutoFactoryTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 import org.jboss.arquillian.testng.Arquillian;
 import org.testng.annotations.Test;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/BulkOrderDiscounts.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/BulkOrderDiscounts.java
index eac5228..327dbe7 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/BulkOrderDiscounts.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/BulkOrderDiscounts.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Discounts.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Discounts.java
index 51dd6fb..9c51d82 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Discounts.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Discounts.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/PriceCalculator.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/PriceCalculator.java
index 39826ca..21a9bc6 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/PriceCalculator.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/PriceCalculator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Product.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Product.java
index 201620e..0192993 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Product.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/Product.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/TotalPriceCalculator.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/TotalPriceCalculator.java
index a9bd226..f358b88 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/TotalPriceCalculator.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/TotalPriceCalculator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory;
+package com.softwaremill.common.cdi.autofactory;
 
 import java.util.List;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/AutoFactoryFieldInjectionTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/AutoFactoryFieldInjectionTest.java
index b7a4bb8..b327aac 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/AutoFactoryFieldInjectionTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/AutoFactoryFieldInjectionTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.autofactory.field;
+package com.softwaremill.common.cdi.autofactory.field;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.AbstractAutoFactoryTest;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.AbstractAutoFactoryTest;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/PriceCalculatorFieldInjectionImpl.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/PriceCalculatorFieldInjectionImpl.java
index 224ac72..3bc0bf2 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/PriceCalculatorFieldInjectionImpl.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/PriceCalculatorFieldInjectionImpl.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.cdi.autofactory.field;
+package com.softwaremill.common.cdi.autofactory.field;
 
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.Discounts;
-import pl.softwaremill.common.cdi.autofactory.PriceCalculator;
-import pl.softwaremill.common.cdi.autofactory.Product;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.Discounts;
+import com.softwaremill.common.cdi.autofactory.PriceCalculator;
+import com.softwaremill.common.cdi.autofactory.Product;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/TotalPriceCalculatorFixedInjectionImpl.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/TotalPriceCalculatorFixedInjectionImpl.java
index 51cf671..25a44b0 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/TotalPriceCalculatorFixedInjectionImpl.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/field/TotalPriceCalculatorFixedInjectionImpl.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.autofactory.field;
+package com.softwaremill.common.cdi.autofactory.field;
 
-import pl.softwaremill.common.cdi.autofactory.*;
+import com.softwaremill.common.cdi.autofactory.*;
 
 import javax.inject.Inject;
 import java.util.List;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InjectDataAndInstanceConstructor.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InjectDataAndInstanceConstructor.java
index c13c25b..6bb4653 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InjectDataAndInstanceConstructor.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InjectDataAndInstanceConstructor.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.autofactory.instance;
+package com.softwaremill.common.cdi.autofactory.instance;
 
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.FactoryParameter;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.FactoryParameter;
 
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean.java
index 0d30b62..d52f916 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.instance;
+package com.softwaremill.common.cdi.autofactory.instance;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean2.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean2.java
index f8b9896..2f3d067 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean2.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/InstanceBean2.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.instance;
+package com.softwaremill.common.cdi.autofactory.instance;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/TestInjectDataAndInstance.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/TestInjectDataAndInstance.java
index 8075a60..930c1bc 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/TestInjectDataAndInstance.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/instance/TestInjectDataAndInstance.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.cdi.autofactory.instance;
+package com.softwaremill.common.cdi.autofactory.instance;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerConstructor.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerConstructor.java
index 3f19e4a..32ea996 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerConstructor.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerConstructor.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.cdi.autofactory.logger;
+package com.softwaremill.common.cdi.autofactory.logger;
 
 import org.slf4j.Logger;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.FactoryParameter;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.FactoryParameter;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerField.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerField.java
index c66c53f..8e37057 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerField.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/InjectDataAndLoggerField.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.autofactory.logger;
+package com.softwaremill.common.cdi.autofactory.logger;
 
 import org.slf4j.Logger;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/TestInjectDataAndLogger.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/TestInjectDataAndLogger.java
index 8959276..dc5ba55 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/TestInjectDataAndLogger.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/logger/TestInjectDataAndLogger.java
@@ -1,13 +1,13 @@
-package pl.softwaremill.common.cdi.autofactory.logger;
+package com.softwaremill.common.cdi.autofactory.logger;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.logger.LoggerProducer;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.logger.LoggerProducer;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/AutoFactoryMixedConstructorTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/AutoFactoryMixedConstructorTest.java
index 3af6bd6..a0cfec6 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/AutoFactoryMixedConstructorTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/AutoFactoryMixedConstructorTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.autofactory.mixed;
+package com.softwaremill.common.cdi.autofactory.mixed;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.AbstractAutoFactoryTest;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.AbstractAutoFactoryTest;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/PriceCalculatorMixedConstructorImpl.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/PriceCalculatorMixedConstructorImpl.java
index ed76fe7..3c35b8c 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/PriceCalculatorMixedConstructorImpl.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/PriceCalculatorMixedConstructorImpl.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.autofactory.mixed;
+package com.softwaremill.common.cdi.autofactory.mixed;
 
-import pl.softwaremill.common.cdi.autofactory.*;
+import com.softwaremill.common.cdi.autofactory.*;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/TotalPriceCalculatorMixedConstructorImpl.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/TotalPriceCalculatorMixedConstructorImpl.java
index 149e6fc..75d294d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/TotalPriceCalculatorMixedConstructorImpl.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/mixed/TotalPriceCalculatorMixedConstructorImpl.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.autofactory.mixed;
+package com.softwaremill.common.cdi.autofactory.mixed;
 
-import pl.softwaremill.common.cdi.autofactory.*;
+import com.softwaremill.common.cdi.autofactory.*;
 
 import javax.inject.Inject;
 import java.util.List;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/BeanWithAdditionalDefaultConstructor.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/BeanWithAdditionalDefaultConstructor.java
index d7bbcd9..05bf7a4 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/BeanWithAdditionalDefaultConstructor.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/BeanWithAdditionalDefaultConstructor.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.cdi.autofactory.multipleconstructors;
+package com.softwaremill.common.cdi.autofactory.multipleconstructors;
 
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.Discounts;
-import pl.softwaremill.common.cdi.autofactory.FactoryParameter;
-import pl.softwaremill.common.cdi.autofactory.Product;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.Discounts;
+import com.softwaremill.common.cdi.autofactory.FactoryParameter;
+import com.softwaremill.common.cdi.autofactory.Product;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/TwoValidConstructorsTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/TwoValidConstructorsTest.java
index 85262e3..ca3ba4d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/TwoValidConstructorsTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/multipleconstructors/TwoValidConstructorsTest.java
@@ -1,14 +1,14 @@
-package pl.softwaremill.common.cdi.autofactory.multipleconstructors;
+package com.softwaremill.common.cdi.autofactory.multipleconstructors;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.Discounts;
-import pl.softwaremill.common.cdi.autofactory.Product;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.Discounts;
+import com.softwaremill.common.cdi.autofactory.Product;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/AutoFactoryWithProducerTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/AutoFactoryWithProducerTest.java
index c4cb11c..8814239 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/AutoFactoryWithProducerTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/AutoFactoryWithProducerTest.java
@@ -1,15 +1,15 @@
-package pl.softwaremill.common.cdi.autofactory.producer;
+package com.softwaremill.common.cdi.autofactory.producer;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.AbstractAutoFactoryTest;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.PriceCalculator;
-import pl.softwaremill.common.cdi.autofactory.mixed.PriceCalculatorMixedConstructorImpl;
-import pl.softwaremill.common.cdi.autofactory.mixed.TotalPriceCalculatorMixedConstructorImpl;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.AbstractAutoFactoryTest;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.PriceCalculator;
+import com.softwaremill.common.cdi.autofactory.mixed.PriceCalculatorMixedConstructorImpl;
+import com.softwaremill.common.cdi.autofactory.mixed.TotalPriceCalculatorMixedConstructorImpl;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExamplePriceCalculatorProducer.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExamplePriceCalculatorProducer.java
index 08dd86c..a1ec585 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExamplePriceCalculatorProducer.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExamplePriceCalculatorProducer.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.cdi.autofactory.producer;
+package com.softwaremill.common.cdi.autofactory.producer;
 
-import pl.softwaremill.common.cdi.autofactory.PriceCalculator;
-import pl.softwaremill.common.cdi.autofactory.Product;
+import com.softwaremill.common.cdi.autofactory.PriceCalculator;
+import com.softwaremill.common.cdi.autofactory.Product;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExampleProductQualifier.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExampleProductQualifier.java
index dcbb1ff..4a5ec83 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExampleProductQualifier.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/producer/ExampleProductQualifier.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.producer;
+package com.softwaremill.common.cdi.autofactory.producer;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.ElementType;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/AutoFactoryWithDependencyQualifierTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/AutoFactoryWithDependencyQualifierTest.java
index 2365b67..f3d57de 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/AutoFactoryWithDependencyQualifierTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/AutoFactoryWithDependencyQualifierTest.java
@@ -1,14 +1,14 @@
-package pl.softwaremill.common.cdi.autofactory.qualifier;
+package com.softwaremill.common.cdi.autofactory.qualifier;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.PriceCalculator;
-import pl.softwaremill.common.cdi.autofactory.Product;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.PriceCalculator;
+import com.softwaremill.common.cdi.autofactory.Product;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/ExampleStringQualifier.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/ExampleStringQualifier.java
index d481ac4..495a303 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/ExampleStringQualifier.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/ExampleStringQualifier.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.qualifier;
+package com.softwaremill.common.cdi.autofactory.qualifier;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.ElementType;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/PriceCalculatorQualifiedDependencyImpl.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/PriceCalculatorQualifiedDependencyImpl.java
index bd32898..f062974 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/PriceCalculatorQualifiedDependencyImpl.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/PriceCalculatorQualifiedDependencyImpl.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.cdi.autofactory.qualifier;
+package com.softwaremill.common.cdi.autofactory.qualifier;
 
-import pl.softwaremill.common.cdi.autofactory.CreatedWith;
-import pl.softwaremill.common.cdi.autofactory.FactoryParameter;
-import pl.softwaremill.common.cdi.autofactory.PriceCalculator;
-import pl.softwaremill.common.cdi.autofactory.Product;
+import com.softwaremill.common.cdi.autofactory.CreatedWith;
+import com.softwaremill.common.cdi.autofactory.FactoryParameter;
+import com.softwaremill.common.cdi.autofactory.PriceCalculator;
+import com.softwaremill.common.cdi.autofactory.Product;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/QualifiedDependency.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/QualifiedDependency.java
index a228bf5..8cfb5f5 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/QualifiedDependency.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/autofactory/qualifier/QualifiedDependency.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.autofactory.qualifier;
+package com.softwaremill.common.cdi.autofactory.qualifier;
 
 @ExampleStringQualifier
 public class QualifiedDependency {
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/conf/ConfValueTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/conf/ConfValueTest.java
index 1d4fe18..85316da 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/conf/ConfValueTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/conf/ConfValueTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.conf;
+package com.softwaremill.common.cdi.conf;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.arquillian.ManifestUtil;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/ELEvaluatorTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/ELEvaluatorTest.java
index 58c9326..1830d46 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/ELEvaluatorTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/ELEvaluatorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
@@ -6,7 +6,7 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.arquillian.ManifestUtil;
 
 import javax.inject.Inject;
 import java.util.HashMap;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/StringHoldingBean.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/StringHoldingBean.java
index 79d1ff8..5bd0dcc 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/StringHoldingBean.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/el/StringHoldingBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.el;
+package com.softwaremill.common.cdi.el;
 
 import javax.inject.Named;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/BeanToIntercept.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/BeanToIntercept.java
index 7daad3b..89c980a 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/BeanToIntercept.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/BeanToIntercept.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.interceptor;
+package com.softwaremill.common.cdi.interceptor;
 
 /**
  * @author Pawel Wrzeszcz (pawel [at] softwaremill . com)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsTest.java
index 64b3669..fe86659 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/interceptor/NullToEmptyStringParamsTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.interceptor;
+package com.softwaremill.common.cdi.interceptor;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
@@ -64,7 +64,7 @@ private static <T extends Archive<T> & ResourceContainer<T>> T addTestBeansXml(T
 		StringBuilder beansXmlBuilder = new StringBuilder();
 		beansXmlBuilder.append("<beans>");
 		beansXmlBuilder.append("<interceptors>");
-		beansXmlBuilder.append("<class>pl.softwaremill.common.cdi.interceptor.NullToEmptyStringParamsInterceptor</class>");
+		beansXmlBuilder.append("<class>com.softwaremill.common.cdi.interceptor.NullToEmptyStringParamsInterceptor</class>");
 		beansXmlBuilder.append("</interceptors>");
 		beansXmlBuilder.append("</beans>");
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/A.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/A.java
index fe84455..de00412 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/A.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/A.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/AbstractService3.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/AbstractService3.java
index b6df9a6..027041d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/AbstractService3.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/AbstractService3.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/B.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/B.java
index 02477d6..1f9e402 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/B.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/B.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/BasicObjectServiceTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/BasicObjectServiceTest.java
index 5271b64..711069c 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/BasicObjectServiceTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/BasicObjectServiceTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
@@ -6,8 +6,8 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
-import pl.softwaremill.common.cdi.objectservice.extension.ObjectServiceExtension;
+import com.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.cdi.objectservice.extension.ObjectServiceExtension;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/C.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/C.java
index 9c3c50a..24a5f1e 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/C.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/C.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1.java
index be4ccd6..80d3313 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1B.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1B.java
index 7bab182..2282a6d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1B.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1B.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1C.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1C.java
index e3dc5ab..549986f 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1C.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service1C.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2.java
index 0a760c3..535745d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2B.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2B.java
index 0e7766f..17b9d3c 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2B.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2B.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 import javax.enterprise.context.ApplicationScoped;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2C.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2C.java
index 18bf763..18ec0af 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2C.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service2C.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 import javax.enterprise.context.RequestScoped;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3.java
index 416d5d0..3e53ad1 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * A service for which implementations inherit from an abtract service.
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3B.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3B.java
index 69ef4b7..495256a 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3B.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3B.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3C.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3C.java
index d21fc24..9e678ba 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3C.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/Service3C.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice;
+package com.softwaremill.common.cdi.objectservice;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoMyString.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoMyString.java
index d44bab5..dc72c5e 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoMyString.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoMyString.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoServiceTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoServiceTest.java
index ec01613..1295c4d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoServiceTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoServiceTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.arquillian.ManifestUtil;
 
 import javax.inject.Inject;
 import java.net.MalformedURLException;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoString.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoString.java
index 9f050d5..d01f49f 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoString.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/AutoString.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/ExecutionMock.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/ExecutionMock.java
index 18cfe4c..d4f7cf5 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/ExecutionMock.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/ExecutionMock.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 import javax.enterprise.context.ApplicationScoped;
 import java.io.Serializable;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/IAuto.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/IAuto.java
index b2efc74..36f46b4 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/IAuto.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/IAuto.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 @OS
 public interface IAuto<T> {
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MySpecialString.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MySpecialString.java
index 05bae50..cbc9862 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MySpecialString.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MySpecialString.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 /**
  * Class that extends MyString for inheritance checks
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MyString.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MyString.java
index e58351e..09b42cf 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MyString.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/objectservice/auto/MyString.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.objectservice.auto;
+package com.softwaremill.common.cdi.objectservice.auto;
 
 /**
  * String wrapper
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/AbstractHibernateTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/AbstractHibernateTest.java
index 3a0c75b..240bae6 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/AbstractHibernateTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/AbstractHibernateTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.jboss.arquillian.testng.Arquillian;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerDelegator.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerDelegator.java
index 66e7cc6..36d3b4c 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerDelegator.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerDelegator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.persistence.*;
 import javax.persistence.criteria.CriteriaBuilder;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerUtilTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerUtilTest.java
index f06a9ca..9d28322 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerUtilTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityManagerUtilTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -6,7 +6,7 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.arquillian.ManifestUtil;
 
 import javax.persistence.EntityManager;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWithLazySubentity.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWithLazySubentity.java
index 3b3ceca..d90a54c 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWithLazySubentity.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWithLazySubentity.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
-import pl.softwaremill.common.util.persistance.Identifiable;
+import com.softwaremill.common.util.persistance.Identifiable;
 
 import javax.persistence.*;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWriterTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWriterTest.java
index 38ce2e3..1109b4a 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWriterTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/EntityWriterTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.hibernate.proxy.HibernateProxy;
@@ -7,7 +7,7 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.arquillian.ManifestUtil;
+import com.softwaremill.common.arquillian.ManifestUtil;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/MockEntityManagerProducers.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/MockEntityManagerProducers.java
index d1c1610..92ae2a5 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/MockEntityManagerProducers.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/MockEntityManagerProducers.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/SimpleEntity.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/SimpleEntity.java
index 4eab496..0066ae1 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/SimpleEntity.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/persistence/SimpleEntity.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.cdi.persistence;
+package com.softwaremill.common.cdi.persistence;
 
-import pl.softwaremill.common.util.persistance.Identifiable;
+import com.softwaremill.common.util.persistance.Identifiable;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AccessIfVar1Set.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AccessIfVar1Set.java
index 623cc79..ee8311a 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AccessIfVar1Set.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AccessIfVar1Set.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagTest.java
index 73bf053..bac62c8 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagTest.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
-import pl.softwaremill.common.cdi.util.ArquillianUtil;
+import com.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.cdi.util.ArquillianUtil;
 
 import javax.inject.Inject;
 import java.util.concurrent.Callable;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagsBean.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagsBean.java
index 2baf28d..d785a8b 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagsBean.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/AllowWithFlagsBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/NoAccess.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/NoAccess.java
index 1c52703..3bf09e2 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/NoAccess.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/NoAccess.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanCompoundContextual.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanCompoundContextual.java
index 6e23b94..34d2d01 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanCompoundContextual.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanCompoundContextual.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanDirect.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanDirect.java
index 94fb0ca..741c626 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanDirect.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanDirect.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanGlobal.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanGlobal.java
index f9ff61f..93fd274 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanGlobal.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanGlobal.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVar.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVar.java
index 9806770..464c7c0 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVar.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVar.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVarExp.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVarExp.java
index b302875..0c36174 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVarExp.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanSecureVarExp.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanStacked.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanStacked.java
index 7010d8a..95392cb 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanStacked.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureBeanStacked.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultBean.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultBean.java
index b0356d7..bada66d 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultBean.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultBean.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultTest.java
index b974e77..41e9ad5 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureResultTest.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
-import pl.softwaremill.common.cdi.util.ArquillianUtil;
+import com.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.cdi.util.ArquillianUtil;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureTest.java
index 6f21e8e..027c1ed 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/SecureTest.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
-import pl.softwaremill.common.cdi.util.ArquillianUtil;
+import com.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.cdi.util.ArquillianUtil;
 
 import javax.inject.Inject;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/StringHolder.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/StringHolder.java
index 5bff212..01430a8 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/StringHolder.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/security/StringHolder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.security;
+package com.softwaremill.common.cdi.security;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducerTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducerTest.java
index c60f89a..fb143bd 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducerTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/sysprops/SystemPropertyProducerTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.sysprops;
+package com.softwaremill.common.cdi.sysprops;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeMethod;
@@ -10,7 +10,7 @@
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static pl.softwaremill.common.cdi.sysprops.SystemProperty.NOT_SET;
+import static com.softwaremill.common.cdi.sysprops.SystemProperty.NOT_SET;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/util/ArquillianUtil.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/util/ArquillianUtil.java
index 2104b2d..cb5c368 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/util/ArquillianUtil.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/util/ArquillianUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.util;
+package com.softwaremill.common.cdi.util;
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -13,8 +13,8 @@ public static <T extends Archive<T> & ResourceContainer<T>> T addTestBeansXml(T
         StringBuilder beansXmlBuilder = new StringBuilder();
         beansXmlBuilder.append("<beans>");
         beansXmlBuilder.append("<interceptors>");
-        beansXmlBuilder.append("<class>pl.softwaremill.common.cdi.security.SecurityInterceptor</class>");
-        beansXmlBuilder.append("<class>pl.softwaremill.common.cdi.security.SecurityResultInterceptor</class>");
+        beansXmlBuilder.append("<class>com.softwaremill.common.cdi.security.SecurityInterceptor</class>");
+        beansXmlBuilder.append("<class>com.softwaremill.common.cdi.security.SecurityResultInterceptor</class>");
         beansXmlBuilder.append("</interceptors>");
         beansXmlBuilder.append("</beans>");
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/LengthValidatorTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/LengthValidatorTest.java
index 0747758..0643a3f 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/LengthValidatorTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/LengthValidatorTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.cdi.validator;
+package com.softwaremill.common.cdi.validator;
 
 import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.validation.Length;
-import pl.softwaremill.common.cdi.validation.LengthValidator;
+import com.softwaremill.common.cdi.validation.Length;
+import com.softwaremill.common.cdi.validation.LengthValidator;
 
 import javax.validation.ConstraintValidatorContext;
 
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/NoSpecialCharsValidatorTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/NoSpecialCharsValidatorTest.java
index c1c825e..d34d421 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/NoSpecialCharsValidatorTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/NoSpecialCharsValidatorTest.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.cdi.validator;
+package com.softwaremill.common.cdi.validator;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.validation.NoSpecialChars;
-import pl.softwaremill.common.cdi.validation.NoSpecialCharsValidator;
+import com.softwaremill.common.cdi.validation.NoSpecialChars;
+import com.softwaremill.common.cdi.validation.NoSpecialCharsValidator;
 
 /**
  * Created by amorfis on Dec 3, 2010 1:40:58 PM
diff --git a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/PasswordValidatorTest.java b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/PasswordValidatorTest.java
index bd30e22..91b2b92 100644
--- a/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/PasswordValidatorTest.java
+++ b/softwaremill-cdi/src/test/java/com/softwaremill/common/cdi/validator/PasswordValidatorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.cdi.validator;
+package com.softwaremill.common.cdi.validator;
 
 import org.mockito.Mockito;
 import org.testng.annotations.AfterMethod;
@@ -7,8 +7,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.validation.Password;
-import pl.softwaremill.common.cdi.validation.PasswordValidator;
+import com.softwaremill.common.cdi.validation.Password;
+import com.softwaremill.common.cdi.validation.PasswordValidator;
 
 import javax.validation.ConstraintValidatorContext;
 
diff --git a/softwaremill-conf/README.txt b/softwaremill-conf/README.txt
index 62d36a4..5a83169 100644
--- a/softwaremill-conf/README.txt
+++ b/softwaremill-conf/README.txt
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-conf</artifactId>
         <version>5</version>
     </dependency>
diff --git a/softwaremill-conf/pom.xml b/softwaremill-conf/pom.xml
index 6f8883a..e6589e4 100644
--- a/softwaremill-conf/pom.xml
+++ b/softwaremill-conf/pom.xml
@@ -4,7 +4,7 @@
     <name>Softwaremill Configuration</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ClasspathPropertiesProvider.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ClasspathPropertiesProvider.java
index 32d428a..2f2de2b 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ClasspathPropertiesProvider.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ClasspathPropertiesProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Config.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Config.java
index 697e8c8..3fecbfc 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Config.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Config.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import java.util.Map;
 
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Configuration.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Configuration.java
index 6119301..ee93a4b 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Configuration.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/Configuration.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import com.google.common.collect.ImmutableMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.conf.encoding.ConfigurationValueCoder;
+import com.softwaremill.common.conf.encoding.ConfigurationValueCoder;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/FolderPropertiesProvider.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/FolderPropertiesProvider.java
index b931954..8dbc6ce 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/FolderPropertiesProvider.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/FolderPropertiesProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import com.google.common.collect.ImmutableMap;
 import org.slf4j.Logger;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss5DeployPropertiesProvider.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss5DeployPropertiesProvider.java
index 7bce466..b948027 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss5DeployPropertiesProvider.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss5DeployPropertiesProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import org.jboss.mx.util.MBeanServerLocator;
 import org.slf4j.Logger;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss6DeployPropertiesProvider.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss6DeployPropertiesProvider.java
index 04e571c..6ddd74f 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss6DeployPropertiesProvider.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss6DeployPropertiesProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import org.jboss.mx.util.MBeanServerLocator;
 import org.slf4j.Logger;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss7DeployPropertiesProvider.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss7DeployPropertiesProvider.java
index 89bea73..822e349 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss7DeployPropertiesProvider.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/JBoss7DeployPropertiesProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 /**
  * JBoss 7 configuration provider
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/MapWrapper.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/MapWrapper.java
index 232c739..241deb8 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/MapWrapper.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/MapWrapper.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/PropertiesProvider.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/PropertiesProvider.java
index baed501..9dd85c0 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/PropertiesProvider.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/PropertiesProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import com.google.common.collect.ImmutableMap;
 
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ScopedConfig.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ScopedConfig.java
index 8949286..e38f17f 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ScopedConfig.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/ScopedConfig.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/SystemPropertiesMapWrapper.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/SystemPropertiesMapWrapper.java
index 2653632..2acc2b7 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/SystemPropertiesMapWrapper.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/SystemPropertiesMapWrapper.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import java.util.Map;
 
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/CodingConsole.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/CodingConsole.java
index 0bb3726..a5aef2c 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/CodingConsole.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/CodingConsole.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding;
+package com.softwaremill.common.conf.encoding;
 
 import java.io.Console;
 import java.io.IOException;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoder.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoder.java
index ca26f9c..f9faaa4 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoder.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding;
+package com.softwaremill.common.conf.encoding;
 
 /**
  * Encodes and decodes configuration values.
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/MasterPasswordStore.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/MasterPasswordStore.java
index 44012f4..b1f4f48 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/MasterPasswordStore.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/MasterPasswordStore.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding;
+package com.softwaremill.common.conf.encoding;
 
 import java.io.IOException;
 
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/TextCoder.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/TextCoder.java
index 0f3daa0..eca8a9d 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/TextCoder.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/TextCoder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding;
+package com.softwaremill.common.conf.encoding;
 
 import com.google.common.base.Charsets;
 
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterClient.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterClient.java
index 5b4cf2d..63a40fc 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterClient.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterClient.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding.server;
+package com.softwaremill.common.conf.encoding.server;
 
 import com.google.common.base.Charsets;
 
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterServer.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterServer.java
index 4365b6b..fa13a88 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterServer.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/MasterPasswordSetterServer.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.conf.encoding.server;
+package com.softwaremill.common.conf.encoding.server;
 
 import com.google.common.base.Charsets;
-import pl.softwaremill.common.conf.encoding.MasterPasswordStore;
+import com.softwaremill.common.conf.encoding.MasterPasswordStore;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/StartupPasswordListenerMainWrapper.java b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/StartupPasswordListenerMainWrapper.java
index 0a5c0e6..a3d9570 100644
--- a/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/StartupPasswordListenerMainWrapper.java
+++ b/softwaremill-conf/src/main/java/com/softwaremill/common/conf/encoding/server/StartupPasswordListenerMainWrapper.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding.server;
+package com.softwaremill.common.conf.encoding.server;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
diff --git a/softwaremill-conf/src/test/java/com/softwaremill/common/conf/ConfigurationTest.java b/softwaremill-conf/src/test/java/com/softwaremill/common/conf/ConfigurationTest.java
index d68ab8b..bccc80b 100644
--- a/softwaremill-conf/src/test/java/com/softwaremill/common/conf/ConfigurationTest.java
+++ b/softwaremill-conf/src/test/java/com/softwaremill/common/conf/ConfigurationTest.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.conf;
+package com.softwaremill.common.conf;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.conf.encoding.MasterPasswordStore;
+import com.softwaremill.common.conf.encoding.MasterPasswordStore;
 
 import java.util.Map;
 
diff --git a/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoderTest.java b/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoderTest.java
index 6bd5f95..6cc5103 100644
--- a/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoderTest.java
+++ b/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/ConfigurationValueCoderTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding;
+package com.softwaremill.common.conf.encoding;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/TextCoderTest.java b/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/TextCoderTest.java
index 27dfcf0..5ff8553 100644
--- a/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/TextCoderTest.java
+++ b/softwaremill-conf/src/test/java/com/softwaremill/common/conf/encoding/TextCoderTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.conf.encoding;
+package com.softwaremill.common.conf.encoding;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/softwaremill-debug/README.md b/softwaremill-debug/README.md
index 5e43e7b..857369c 100644
--- a/softwaremill-debug/README.md
+++ b/softwaremill-debug/README.md
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-debug</artifactId>
     </dependency>
 
@@ -18,7 +18,7 @@ Times method calls. The results can be displayed using the filter or printed man
 To enable, annotate desired classes/methdods with `@Timed` and enable the interceptor in `beans.xml`:
 
     <interceptors>
-        <class>pl.softwaremill.common.debug.timing.TimingInterceptor</class>
+        <class>com.softwaremill.common.debug.timing.TimingInterceptor</class>
     </interceptors>
 
 ## Timing proxy
@@ -48,7 +48,7 @@ To enable, add to `web.xml`:
 
     <filter>
         <filter-name>Debug</filter-name>
-        <filter-class>pl.softwaremill.common.debug.timing.TimingOutputFilter</filter-class>
+        <filter-class>com.softwaremill.common.debug.timing.TimingOutputFilter</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/softwaremill-debug/pom.xml b/softwaremill-debug/pom.xml
index 9c39b09..c7a9c51 100644
--- a/softwaremill-debug/pom.xml
+++ b/softwaremill-debug/pom.xml
@@ -5,7 +5,7 @@
     <name>Softwaremill Debugging utilities</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
     <dependencies>
         <!-- Inter-modules dependencies -->
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-util</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/Timed.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/Timed.java
index 93c15da..9811f46 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/Timed.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/Timed.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimedInvocation.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimedInvocation.java
index 8f9e3c5..740e321 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimedInvocation.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimedInvocation.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import java.lang.reflect.Method;
 
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingExtension.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingExtension.java
index f5be860..894c1bf 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingExtension.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingExtension.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import com.google.common.base.Strings;
 import org.jboss.solder.reflection.annotated.AnnotatedTypeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.util.RichString;
+import com.softwaremill.common.util.RichString;
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AnnotatedType;
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingInterceptor.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingInterceptor.java
index 0e7d3be..3928800 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingInterceptor.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingInterceptor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingOutputFilter.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingOutputFilter.java
index fb9150c..f93e1a0 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingOutputFilter.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingOutputFilter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import javax.servlet.*;
 import java.io.IOException;
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingProxy.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingProxy.java
index 698084d..46a504d 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingProxy.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingProxy.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingResults.java b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingResults.java
index 19414c5..c78c44e 100644
--- a/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingResults.java
+++ b/softwaremill-debug/src/main/java/com/softwaremill/common/debug/timing/TimingResults.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.debug.timing;
+package com.softwaremill.common.debug.timing;
 
 import javax.interceptor.InvocationContext;
 import java.lang.reflect.Method;
diff --git a/softwaremill-debug/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/softwaremill-debug/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index dbfefb4..e90533d 100644
--- a/softwaremill-debug/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/softwaremill-debug/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1 +1 @@
-pl.softwaremill.common.debug.timing.TimingExtension
+com.softwaremill.common.debug.timing.TimingExtension
diff --git a/softwaremill-faces/README.md b/softwaremill-faces/README.md
index 55793c5..76b0a5b 100644
--- a/softwaremill-faces/README.md
+++ b/softwaremill-faces/README.md
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-faces</artifactId>
         <version>8</version>
     </dependency>
@@ -16,7 +16,7 @@ CurrentLocale.setCurrentLocale method.
 To enable, add to `faces-config.xml`:
 
     <application>
-        <view-handler>pl.softwaremill.common.faces.i18n.CurrentLocaleViewHandler</view-handler>
+        <view-handler>com.softwaremill.common.faces.i18n.CurrentLocaleViewHandler</view-handler>
     </application>
 
 ## Transaction JSF phase listeners
@@ -27,7 +27,7 @@ and a second one for rendering the response.
 To enable, add to `faces-config.xml`:
 
     <lifecycle>
-        <phase-listener>pl.softwaremill.common.faces.transaction.TransactionPhaseListener</phase-listener>
+        <phase-listener>com.softwaremill.common.faces.transaction.TransactionPhaseListener</phase-listener>
     </lifecycle>
 
 ## Fields equal validator
@@ -46,7 +46,7 @@ To enable, add to `faces-config.xml`:
 
     <validator>
         <validator-id>fieldsEqual</validator-id>
-        <validator-class>pl.softwaremill.common.faces.validator.FieldsEqualValidator</validator-class>
+        <validator-class>com.softwaremill.common.faces.validator.FieldsEqualValidator</validator-class>
     </validator>
 
 ## Faces messages
@@ -61,7 +61,7 @@ To enable, add to `faces-config.xml`:
     <application>
         <system-event-listener>
             <system-event-class>javax.faces.event.PreRenderViewEvent</system-event-class>
-            <system-event-listener-class>pl.softwaremill.common.faces.messages.FacesMessagesListener</system-event-listener-class>
+            <system-event-listener-class>com.softwaremill.common.faces.messages.FacesMessagesListener</system-event-listener-class>
         </system-event-listener>
     </application>
 
@@ -77,7 +77,7 @@ attribute, as it interferes with `<f:ajax>` (don't ask me why ... ;) ).
 To enable, add to `faces-config.xml`:
 
     <lifecycle>
-        <phase-listener>pl.softwaremill.common.faces.navigation.RequiredViewParameterPhaseListener</phase-listener>
+        <phase-listener>com.softwaremill.common.faces.navigation.RequiredViewParameterPhaseListener</phase-listener>
     </lifecycle>
 
 ## Restricting pages to logged in users only
@@ -89,7 +89,7 @@ login page if a user isn't logged in.
 To enable, add to `faces-config.xml`:
 
     <lifecycle>
-        <phase-listener>pl.softwaremill.common.faces.security.SecurityPhaseListener</phase-listener>
+        <phase-listener>com.softwaremill.common.faces.security.SecurityPhaseListener</phase-listener>
     </lifecycle>
 
 ## Navigation
@@ -123,7 +123,7 @@ Enclose `UIInput` components for cross-field validation in `multiValidator` tag.
 
     <html xmlns="http://www.w3.org/1999/xhtml"
           xmlns:h="http://java.sun.com/jsf/html"
-          xmlns:v="http://pl.softwaremill.common.faces/components">
+          xmlns:v="http://com.softwaremill.common.faces/components">
 
       <v:multiValidator id="atLeastOne" validator="#{bean.validateAtLeastOne}">
         <h:selectBooleanCheckbox value="#{debtorBean.check1}"/>
@@ -234,6 +234,6 @@ The simpliest form with file upload:
 
 It is also necessary to add namespace:
 
-    xmlns:sml="http://pl.softwaremill.common.faces/components"
+    xmlns:sml="http://com.softwaremill.common.faces/components"
 
 `file` property of the `bean` is of type java.io.File. `sml:fileUpload` renders to &lt;input type="file"&gt;. After form submit, file is in the bean.
\ No newline at end of file
diff --git a/softwaremill-faces/pom.xml b/softwaremill-faces/pom.xml
index 6219632..39fee78 100644
--- a/softwaremill-faces/pom.xml
+++ b/softwaremill-faces/pom.xml
@@ -5,7 +5,7 @@
     <name>Softwaremill JSF Extensions</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -13,12 +13,12 @@
     <dependencies>
         <!-- Inter-modules dependencies -->
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-util</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-cdi</artifactId>
             <version>${version}</version>
         </dependency>
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUpload.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUpload.java
index 87d10cc..01a1379 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUpload.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUpload.java
@@ -15,7 +15,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-package pl.softwaremill.common.faces.fileupload;
+package com.softwaremill.common.faces.fileupload;
 
 import javax.faces.component.FacesComponent;
 import javax.faces.component.html.HtmlInputText;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUploadRenderer.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUploadRenderer.java
index dca9f8e..a7d33a0 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUploadRenderer.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/fileupload/FileUploadRenderer.java
@@ -17,7 +17,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-package pl.softwaremill.common.faces.fileupload;
+package com.softwaremill.common.faces.fileupload;
 
 import com.sun.faces.renderkit.Attribute;
 import com.sun.faces.renderkit.AttributeManager;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocale.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocale.java
index 476b234..60b1387 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocale.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocale.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.i18n;
+package com.softwaremill.common.faces.i18n;
 
 import javax.enterprise.context.SessionScoped;
 import javax.faces.context.FacesContext;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocaleViewHandler.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocaleViewHandler.java
index 6a62de5..bb7818c 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocaleViewHandler.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/i18n/CurrentLocaleViewHandler.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.faces.i18n;
+package com.softwaremill.common.faces.i18n;
 
-import pl.softwaremill.common.cdi.util.BeanInject;
+import com.softwaremill.common.cdi.util.BeanInject;
 
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessages.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessages.java
index 6a302ea..f0b6a95 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessages.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessages.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.faces.messages;
+package com.softwaremill.common.faces.messages;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
-import pl.softwaremill.common.faces.i18n.CurrentLocale;
+import com.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.faces.i18n.CurrentLocale;
 
 import javax.enterprise.context.SessionScoped;
 import javax.faces.application.FacesMessage;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessagesListener.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessagesListener.java
index b5636c8..8769936 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessagesListener.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/messages/FacesMessagesListener.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.faces.messages;
+package com.softwaremill.common.faces.messages;
 
-import pl.softwaremill.common.cdi.util.BeanInject;
+import com.softwaremill.common.cdi.util.BeanInject;
 
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.SystemEvent;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/AbstractPage.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/AbstractPage.java
index a17fdb5..e905a75 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/AbstractPage.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/AbstractPage.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.navigation;
+package com.softwaremill.common.faces.navigation;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/CurrentPage.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/CurrentPage.java
index 961ad53..f686b0b 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/CurrentPage.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/CurrentPage.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.navigation;
+package com.softwaremill.common.faces.navigation;
 
 import javax.faces.context.FacesContext;
 import java.util.Collections;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/NavBase.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/NavBase.java
index 7586aa3..d4455c5 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/NavBase.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/NavBase.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.navigation;
+package com.softwaremill.common.faces.navigation;
 
 import javax.faces.context.FacesContext;
 import java.util.HashMap;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/Page.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/Page.java
index 7c0b146..0621aeb 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/Page.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/Page.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.navigation;
+package com.softwaremill.common.faces.navigation;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/RequiredViewParameterPhaseListener.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/RequiredViewParameterPhaseListener.java
index 70ea2f5..2c60a49 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/RequiredViewParameterPhaseListener.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/RequiredViewParameterPhaseListener.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.faces.navigation;
+package com.softwaremill.common.faces.navigation;
 
-import pl.softwaremill.common.cdi.util.BeanInject;
-import pl.softwaremill.common.faces.messages.FacesMessages;
+import com.softwaremill.common.cdi.util.BeanInject;
+import com.softwaremill.common.faces.messages.FacesMessages;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/ViewIdPage.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/ViewIdPage.java
index 75e0484..88a85fb 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/ViewIdPage.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/navigation/ViewIdPage.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.navigation;
+package com.softwaremill.common.faces.navigation;
 
 import java.util.Map;
 
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/security/SecurityPhaseListener.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/security/SecurityPhaseListener.java
index 287cab6..4f2fd62 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/security/SecurityPhaseListener.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/security/SecurityPhaseListener.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.faces.security;
+package com.softwaremill.common.faces.security;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.cdi.el.ELEvaluator;
-import pl.softwaremill.common.cdi.security.LoginBean;
-import pl.softwaremill.common.cdi.util.BeanInject;
-import pl.softwaremill.common.faces.navigation.NavBase;
-import pl.softwaremill.common.faces.navigation.Page;
+import com.softwaremill.common.cdi.el.ELEvaluator;
+import com.softwaremill.common.cdi.security.LoginBean;
+import com.softwaremill.common.cdi.util.BeanInject;
+import com.softwaremill.common.faces.navigation.NavBase;
+import com.softwaremill.common.faces.navigation.Page;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseEvent;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionExceptionObserver.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionExceptionObserver.java
index a415d09..3c55d29 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionExceptionObserver.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionExceptionObserver.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.transaction;
+package com.softwaremill.common.faces.transaction;
 
 import javax.annotation.Resource;
 import javax.enterprise.event.Observes;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionPhaseListener.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionPhaseListener.java
index f9b2929..cd90ca3 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionPhaseListener.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/transaction/TransactionPhaseListener.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.transaction;
+package com.softwaremill.common.faces.transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/AbstractDelgatingValidator.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/AbstractDelgatingValidator.java
index a0cf090..4da72a7 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/AbstractDelgatingValidator.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/AbstractDelgatingValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.validator;
+package com.softwaremill.common.faces.validator;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/DelegatingValidator.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/DelegatingValidator.java
index 4be345f..eb31375 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/DelegatingValidator.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/DelegatingValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.validator;
+package com.softwaremill.common.faces.validator;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/FieldsEqualValidator.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/FieldsEqualValidator.java
index 6a5d1fd..5675acd 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/FieldsEqualValidator.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/FieldsEqualValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.validator;
+package com.softwaremill.common.faces.validator;
 
 import com.google.common.base.Objects;
 
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/MultiValidator.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/MultiValidator.java
index 8b2248b..9bfb9c4 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/MultiValidator.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/MultiValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.validator;
+package com.softwaremill.common.faces.validator;
 
 import javax.faces.component.FacesComponent;
 import javax.faces.component.UIComponent;
diff --git a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/OnSubmitValidator.java b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/OnSubmitValidator.java
index af4a773..890ce18 100644
--- a/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/OnSubmitValidator.java
+++ b/softwaremill-faces/src/main/java/com/softwaremill/common/faces/validator/OnSubmitValidator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.validator;
+package com.softwaremill.common.faces.validator;
 
 import com.google.common.base.Strings;
 
diff --git a/softwaremill-faces/src/main/resources/META-INF/smlComponents.taglib.xml b/softwaremill-faces/src/main/resources/META-INF/smlComponents.taglib.xml
index 98f5357..64296d5 100644
--- a/softwaremill-faces/src/main/resources/META-INF/smlComponents.taglib.xml
+++ b/softwaremill-faces/src/main/resources/META-INF/smlComponents.taglib.xml
@@ -3,7 +3,7 @@
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
              version="2.0">
-  <namespace>http://pl.softwaremill.common.faces/components</namespace>
+  <namespace>http://com.softwaremill.common.faces/components</namespace>
   <tag>
     <tag-name>multiValidator</tag-name>
     <component>
diff --git a/softwaremill-faces/src/test/java/com/softwaremill/common/faces/validator/DelegatingValidatorTest.java b/softwaremill-faces/src/test/java/com/softwaremill/common/faces/validator/DelegatingValidatorTest.java
index d8e99d0..378268a 100644
--- a/softwaremill-faces/src/test/java/com/softwaremill/common/faces/validator/DelegatingValidatorTest.java
+++ b/softwaremill-faces/src/test/java/com/softwaremill/common/faces/validator/DelegatingValidatorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.faces.validator;
+package com.softwaremill.common.faces.validator;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-parent/pom.xml b/softwaremill-parent/pom.xml
index d9a0f3e..3289bc7 100644
--- a/softwaremill-parent/pom.xml
+++ b/softwaremill-parent/pom.xml
@@ -5,7 +5,7 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -18,57 +18,57 @@
         <dependencies>
             <!-- SML common -->
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-conf</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-util</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-sqs</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-test-util</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-test-db</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-test-ui-swing</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-test-ui-web</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-test-arquillian</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-cdi</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-faces</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>pl.softwaremill.common</groupId>
+                <groupId>com.softwaremill.common</groupId>
                 <artifactId>softwaremill-backup</artifactId>
                 <version>${softwaremill.common.version}</version>
             </dependency>
diff --git a/softwaremill-paypal/README.md b/softwaremill-paypal/README.md
index a65c69f..5bea55d 100644
--- a/softwaremill-paypal/README.md
+++ b/softwaremill-paypal/README.md
@@ -5,7 +5,7 @@
 To enable your application supporting paypal requests, you need to extend the abstract
 
 ```java
-pl.softwaremill.common.paypal.servlet.IPNServlet
+com.softwaremill.common.paypal.servlet.IPNServlet
 ```
 
 And provide an implementation of two things - PayPalErrorHandler and an instance of PayPalProcessorsFactory that will
diff --git a/softwaremill-paypal/pom.xml b/softwaremill-paypal/pom.xml
index 169e3a8..884e1eb 100644
--- a/softwaremill-paypal/pom.xml
+++ b/softwaremill-paypal/pom.xml
@@ -4,7 +4,7 @@
 
   <parent>
     <artifactId>softwaremill-common-parent</artifactId>
-    <groupId>pl.softwaremill.common</groupId>
+    <groupId>com.softwaremill.common</groupId>
     <version>74-SNAPSHOT</version>
   </parent>
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalButtonGenerator.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalButtonGenerator.java
index 4ee7634..a659667 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalButtonGenerator.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalButtonGenerator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.button;
+package com.softwaremill.common.paypal.button;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalCartItem.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalCartItem.java
index f065cb0..5b5a528 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalCartItem.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/button/PaypalCartItem.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.button;
+package com.softwaremill.common.paypal.button;
 
 /**
  * Cart item, uploaded to paypal
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalErrorHandler.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalErrorHandler.java
index b177da8..9915009 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalErrorHandler.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalErrorHandler.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.paypal.process;
+package com.softwaremill.common.paypal.process;
 
-import pl.softwaremill.common.paypal.process.processors.PayPalProcessor;
+import com.softwaremill.common.paypal.process.processors.PayPalProcessor;
 
 import java.util.Date;
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalParameters.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalParameters.java
index 869f507..99d76f0 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalParameters.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/PayPalParameters.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process;
+package com.softwaremill.common.paypal.process;
 
 public class PayPalParameters {
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/RequestParameters.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/RequestParameters.java
index 969e0a2..583f272 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/RequestParameters.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/RequestParameters.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process;
+package com.softwaremill.common.paypal.process;
 
 import javax.servlet.ServletRequest;
 import java.io.UnsupportedEncodingException;
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/AbstractPayPalProcessor.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/AbstractPayPalProcessor.java
index 285a39c..90b556e 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/AbstractPayPalProcessor.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/AbstractPayPalProcessor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
 public abstract class AbstractPayPalProcessor implements PayPalProcessor {
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/InvalidPayPalProcessor.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/InvalidPayPalProcessor.java
index 4918cd7..89e20f8 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/InvalidPayPalProcessor.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/InvalidPayPalProcessor.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
-import pl.softwaremill.common.paypal.process.PayPalParameters;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.process.PayPalParameters;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
 
 public class InvalidPayPalProcessor extends AbstractPayPalProcessor {
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessor.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessor.java
index ab8a48d..0226867 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessor.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessor.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
-import pl.softwaremill.common.paypal.process.PayPalParameters;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.process.PayPalParameters;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
 
 public interface PayPalProcessor {
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessorsFactory.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessorsFactory.java
index 0c1c21c..055410a 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessorsFactory.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/PayPalProcessorsFactory.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/UnknownPayPalProcessor.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/UnknownPayPalProcessor.java
index f566262..52852b3 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/UnknownPayPalProcessor.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/UnknownPayPalProcessor.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
-import pl.softwaremill.common.paypal.process.PayPalParameters;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.process.PayPalParameters;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
 
 public class UnknownPayPalProcessor extends AbstractPayPalProcessor {
     
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/VerifiedPayPalProcessor.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/VerifiedPayPalProcessor.java
index 6c146d3..5c7b7f5 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/VerifiedPayPalProcessor.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/processors/VerifiedPayPalProcessor.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
 
 public abstract class VerifiedPayPalProcessor extends AbstractPayPalProcessor {
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/DefaultPayPalStatusVerifier.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/DefaultPayPalStatusVerifier.java
index f397465..7e39037 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/DefaultPayPalStatusVerifier.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/DefaultPayPalStatusVerifier.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.paypal.process.status;
+package com.softwaremill.common.paypal.process.status;
 
 import com.google.common.base.Charsets;
-import pl.softwaremill.common.paypal.process.RequestParameters;
+import com.softwaremill.common.paypal.process.RequestParameters;
 
 import java.io.*;
 import java.net.URL;
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatus.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatus.java
index 295dc26..b0c1cd3 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatus.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatus.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process.status;
+package com.softwaremill.common.paypal.process.status;
 
 public class PayPalStatus {
 
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatusVerifier.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatusVerifier.java
index 7f3f666..2845893 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatusVerifier.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/PayPalStatusVerifier.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.paypal.process.status;
+package com.softwaremill.common.paypal.process.status;
 
-import pl.softwaremill.common.paypal.process.RequestParameters;
+import com.softwaremill.common.paypal.process.RequestParameters;
 
 /**
  * @Author: lukasz.zuchowski at gmail dot com
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/VerificationException.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/VerificationException.java
index 751cea1..a7b77bd 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/VerificationException.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/process/status/VerificationException.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process.status;
+package com.softwaremill.common.paypal.process.status;
 
 /**
  * @Author: lukasz.zuchowski at gmail dot com
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/service/PayPalVerificationService.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/service/PayPalVerificationService.java
index 12ce54f..b2b41a2 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/service/PayPalVerificationService.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/service/PayPalVerificationService.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.paypal.service;
-
-import pl.softwaremill.common.paypal.process.*;
-import pl.softwaremill.common.paypal.process.processors.PayPalProcessor;
-import pl.softwaremill.common.paypal.process.processors.PayPalProcessorsFactory;
-import pl.softwaremill.common.paypal.process.status.DefaultPayPalStatusVerifier;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
-import pl.softwaremill.common.paypal.process.status.PayPalStatusVerifier;
+package com.softwaremill.common.paypal.service;
+
+import com.softwaremill.common.paypal.process.*;
+import com.softwaremill.common.paypal.process.processors.PayPalProcessor;
+import com.softwaremill.common.paypal.process.processors.PayPalProcessorsFactory;
+import com.softwaremill.common.paypal.process.status.DefaultPayPalStatusVerifier;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.process.status.PayPalStatusVerifier;
 
 /**
  * @Author: lukasz.zuchowski at gmail dot com
diff --git a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/servlet/IPNServlet.java b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/servlet/IPNServlet.java
index fe49643..b45ae05 100644
--- a/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/servlet/IPNServlet.java
+++ b/softwaremill-paypal/src/main/java/com/softwaremill/common/paypal/servlet/IPNServlet.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.paypal.servlet;
+package com.softwaremill.common.paypal.servlet;
 
-import pl.softwaremill.common.paypal.process.PayPalErrorHandler;
-import pl.softwaremill.common.paypal.process.RequestParameters;
-import pl.softwaremill.common.paypal.process.processors.PayPalProcessorsFactory;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
-import pl.softwaremill.common.paypal.service.PayPalVerificationService;
+import com.softwaremill.common.paypal.process.PayPalErrorHandler;
+import com.softwaremill.common.paypal.process.RequestParameters;
+import com.softwaremill.common.paypal.process.processors.PayPalProcessorsFactory;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.service.PayPalVerificationService;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
diff --git a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/button/PaypalButtonGeneratorTest.java b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/button/PaypalButtonGeneratorTest.java
index 6a18dd7..ebd6e7e 100644
--- a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/button/PaypalButtonGeneratorTest.java
+++ b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/button/PaypalButtonGeneratorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.button;
+package com.softwaremill.common.paypal.button;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/TestErrorHandler.java b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/TestErrorHandler.java
index ad6d15a..b99d712 100644
--- a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/TestErrorHandler.java
+++ b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/TestErrorHandler.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.process;
+package com.softwaremill.common.paypal.process;
 
 import java.util.logging.Logger;
 
diff --git a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/processors/MockVerifiedPayPalProcessor.java b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/processors/MockVerifiedPayPalProcessor.java
index ccd7179..c37d7ad 100644
--- a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/processors/MockVerifiedPayPalProcessor.java
+++ b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/processors/MockVerifiedPayPalProcessor.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.paypal.process.processors;
+package com.softwaremill.common.paypal.process.processors;
 
-import pl.softwaremill.common.paypal.process.PayPalParameters;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
-import pl.softwaremill.common.paypal.service.PayPalVerificationServiceTest;
+import com.softwaremill.common.paypal.process.PayPalParameters;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.service.PayPalVerificationServiceTest;
 
 import java.util.logging.Logger;
 
diff --git a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/status/MockStatusVerifier.java b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/status/MockStatusVerifier.java
index 644a471..1e00104 100644
--- a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/status/MockStatusVerifier.java
+++ b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/process/status/MockStatusVerifier.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.paypal.process.status;
+package com.softwaremill.common.paypal.process.status;
 
-import pl.softwaremill.common.paypal.process.RequestParameters;
+import com.softwaremill.common.paypal.process.RequestParameters;
 
 import java.util.logging.Logger;
 
diff --git a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/PayPalVerificationServiceTest.java b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/PayPalVerificationServiceTest.java
index 592b1e4..a46bfd5 100644
--- a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/PayPalVerificationServiceTest.java
+++ b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/PayPalVerificationServiceTest.java
@@ -1,13 +1,13 @@
-package pl.softwaremill.common.paypal.service;
+package com.softwaremill.common.paypal.service;
 
 import org.testng.annotations.Test;
-import pl.softwaremill.common.paypal.process.RequestParameters;
-import pl.softwaremill.common.paypal.process.TestErrorHandler;
-import pl.softwaremill.common.paypal.process.processors.MockVerifiedPayPalProcessor;
-import pl.softwaremill.common.paypal.process.processors.PayPalProcessorsFactory;
-import pl.softwaremill.common.paypal.process.status.MockStatusVerifier;
-import pl.softwaremill.common.paypal.process.status.PayPalStatus;
-import pl.softwaremill.common.paypal.process.status.PayPalStatusVerifier;
+import com.softwaremill.common.paypal.process.RequestParameters;
+import com.softwaremill.common.paypal.process.TestErrorHandler;
+import com.softwaremill.common.paypal.process.processors.MockVerifiedPayPalProcessor;
+import com.softwaremill.common.paypal.process.processors.PayPalProcessorsFactory;
+import com.softwaremill.common.paypal.process.status.MockStatusVerifier;
+import com.softwaremill.common.paypal.process.status.PayPalStatus;
+import com.softwaremill.common.paypal.process.status.PayPalStatusVerifier;
 
 import java.util.HashMap;
 import java.util.logging.Logger;
diff --git a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/RequestMock.java b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/RequestMock.java
index 06eaf73..84a31f5 100644
--- a/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/RequestMock.java
+++ b/softwaremill-paypal/src/test/java/com/softwaremill/common/paypal/service/RequestMock.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.paypal.service;
+package com.softwaremill.common.paypal.service;
 
 import javax.servlet.AsyncContext;
 import javax.servlet.DispatcherType;
diff --git a/softwaremill-sqs/README.md b/softwaremill-sqs/README.md
index 8c2d701..b2f7c5c 100644
--- a/softwaremill-sqs/README.md
+++ b/softwaremill-sqs/README.md
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-sqs</artifactId>
         <version>...</version>
     </dependency>
diff --git a/softwaremill-sqs/pom.xml b/softwaremill-sqs/pom.xml
index aa7c15c..f939831 100644
--- a/softwaremill-sqs/pom.xml
+++ b/softwaremill-sqs/pom.xml
@@ -6,19 +6,19 @@
 	<name>Softwaremill SQS support</name>
 
 	<parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
 
 	<dependencies>
 		<dependency>
-			<groupId>pl.softwaremill.common</groupId>
+			<groupId>com.softwaremill.common</groupId>
 			<artifactId>softwaremill-conf</artifactId>
             <version>${version}</version>
 		</dependency>
 		<dependency>
-			<groupId>pl.softwaremill.common</groupId>
+			<groupId>com.softwaremill.common</groupId>
 			<artifactId>softwaremill-util</artifactId>
             <version>${version}</version>
 		</dependency>
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/MessageId.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/MessageId.java
index 450cd20..249eb61 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/MessageId.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/MessageId.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 /**
  * A wrapper object around an SQS MessageID.
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Queue.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Queue.java
index 9dcde1d..f69d87e 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Queue.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Queue.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.sqs.AmazonSQS;
@@ -8,14 +8,14 @@
 import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.sqs.exception.SQSRuntimeException;
+import com.softwaremill.common.sqs.exception.SQSRuntimeException;
 
 import java.io.IOException;
 import java.io.Serializable;
 
 import static com.google.common.base.Preconditions.*;
 import static java.lang.String.format;
-import static pl.softwaremill.common.sqs.Util.deserializeFromBase64;
+import static com.softwaremill.common.sqs.Util.deserializeFromBase64;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceiptHandle.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceiptHandle.java
index 96e549d..f3a225b 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceiptHandle.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceiptHandle.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceivedMessage.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceivedMessage.java
index 823c54e..ded2bc4 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceivedMessage.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/ReceivedMessage.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQS.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQS.java
index 3d8fcfd..308f64b 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQS.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQS.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.ClientConfiguration;
@@ -8,10 +8,10 @@
 import com.amazonaws.services.sqs.model.GetQueueUrlRequest;
 import com.amazonaws.services.sqs.model.GetQueueUrlResult;
 import com.amazonaws.services.sqs.model.QueueDoesNotExistException;
-import pl.softwaremill.common.sqs.exception.SQSRuntimeException;
+import com.softwaremill.common.sqs.exception.SQSRuntimeException;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static pl.softwaremill.common.sqs.SQSConfiguration.*;
+import static com.softwaremill.common.sqs.SQSConfiguration.*;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSConfiguration.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSConfiguration.java
index 1a4b618..638ec24 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSConfiguration.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSConfiguration.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
-import pl.softwaremill.common.conf.Configuration;
+import com.softwaremill.common.conf.Configuration;
 
 import java.util.Map;
 
@@ -40,7 +40,7 @@ public class SQSConfiguration {
 
     static {
         // Can be set e.g. by Selenium tests as an argument when starting up JBoss
-        discardMessagesSentBefore = Long.parseLong(System.getProperty("pl.softwaremill.common.sqs.discard_messages_sent_before", "0"));
+        discardMessagesSentBefore = Long.parseLong(System.getProperty("com.softwaremill.common.sqs.discard_messages_sent_before", "0"));
         System.out.println("--- Discard SQS messages sent before = " + discardMessagesSentBefore);
     }
 
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSEmptor.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSEmptor.java
index 9dea787..e0ff2e7 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSEmptor.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/SQSEmptor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import com.amazonaws.AmazonServiceException;
 import com.google.common.base.Charsets;
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Util.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Util.java
index c99c615..381547d 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Util.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/Util.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import com.amazonaws.Protocol;
 import com.google.common.base.Objects;
-import pl.softwaremill.common.sqs.util.Base64Coder;
+import com.softwaremill.common.sqs.util.Base64Coder;
 
 import java.io.*;
 
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/EmailSender.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/EmailSender.java
index 22d82c6..cb51237 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/EmailSender.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/EmailSender.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.sqs.email;
+package com.softwaremill.common.sqs.email;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.sqs.util.AttachmentDescription;
-import pl.softwaremill.common.sqs.util.EmailDescription;
+import com.softwaremill.common.sqs.util.AttachmentDescription;
+import com.softwaremill.common.sqs.util.EmailDescription;
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTask.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTask.java
index b5a0385..92513b0 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTask.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTask.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.sqs.email;
+package com.softwaremill.common.sqs.email;
 
-import pl.softwaremill.common.sqs.util.EmailDescription;
-import pl.softwaremill.common.task.OneTimeTask;
-import pl.softwaremill.common.task.TaskExecutor;
+import com.softwaremill.common.sqs.util.EmailDescription;
+import com.softwaremill.common.task.OneTimeTask;
+import com.softwaremill.common.task.TaskExecutor;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTaskExecutor.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTaskExecutor.java
index cfb2752..b6daff5 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTaskExecutor.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/email/SendEmailTaskExecutor.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.sqs.email;
+package com.softwaremill.common.sqs.email;
 
-import pl.softwaremill.common.task.TaskExecutor;
+import com.softwaremill.common.task.TaskExecutor;
 
 import javax.mail.MessagingException;
 
-import static pl.softwaremill.common.sqs.SQSConfiguration.*;
+import static com.softwaremill.common.sqs.SQSConfiguration.*;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/exception/SQSRuntimeException.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/exception/SQSRuntimeException.java
index a80b8d9..e1dba81 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/exception/SQSRuntimeException.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/exception/SQSRuntimeException.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.exception;
+package com.softwaremill.common.sqs.exception;
 
 /**
  * Runtime Exception wrapping SQS exceptions
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimer.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimer.java
index 24e9ec5..f22cdaa 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimer.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.task;
+package com.softwaremill.common.sqs.task;
 
 import javax.ejb.Local;
 import javax.ejb.Timer;
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimerBean.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimerBean.java
index 4f1bc8d..eae9aaf 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimerBean.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/task/SQSTaskTimerBean.java
@@ -1,19 +1,19 @@
-package pl.softwaremill.common.sqs.task;
+package com.softwaremill.common.sqs.task;
 
 import com.google.common.base.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.sqs.Queue;
-import pl.softwaremill.common.sqs.ReceivedMessage;
-import pl.softwaremill.common.sqs.SQS;
-import pl.softwaremill.common.sqs.timer.TimerManager;
-import pl.softwaremill.common.task.ExecuteWithRequestContext;
-import pl.softwaremill.common.task.OneTimeTask;
+import com.softwaremill.common.sqs.Queue;
+import com.softwaremill.common.sqs.ReceivedMessage;
+import com.softwaremill.common.sqs.SQS;
+import com.softwaremill.common.sqs.timer.TimerManager;
+import com.softwaremill.common.task.ExecuteWithRequestContext;
+import com.softwaremill.common.task.OneTimeTask;
 
 import javax.ejb.Timeout;
 import javax.inject.Inject;
 
-import static pl.softwaremill.common.sqs.SQSConfiguration.TASK_SQS_QUEUE;
+import static com.softwaremill.common.sqs.SQSConfiguration.TASK_SQS_QUEUE;
 
 /**
  * Receiver polling Amazon's SQS queue and executing tasks.
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/timer/TimerManager.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/timer/TimerManager.java
index ff47fb0..5830fac 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/timer/TimerManager.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/timer/TimerManager.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.timer;
+package com.softwaremill.common.sqs.timer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/AttachmentDescription.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/AttachmentDescription.java
index 49da312..3c4fdec 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/AttachmentDescription.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/AttachmentDescription.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.util;
+package com.softwaremill.common.sqs.util;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/Base64Coder.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/Base64Coder.java
index 052f205..76d5e2c 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/Base64Coder.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/Base64Coder.java
@@ -12,7 +12,7 @@
 // Please contact the author if you need another license.
 // This module is provided "as is", without warranties of any kind.
 
-package pl.softwaremill.common.sqs.util;
+package com.softwaremill.common.sqs.util;
 
 /**
  * A Base64 encoder/decoder.
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/EmailDescription.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/EmailDescription.java
index 38cab61..272ea02 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/EmailDescription.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/EmailDescription.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.util;
+package com.softwaremill.common.sqs.util;
 
 import java.io.Serializable;
 
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/SQSAnswer.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/SQSAnswer.java
index 66c7be2..d63782c 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/SQSAnswer.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/sqs/util/SQSAnswer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.util;
+package com.softwaremill.common.sqs.util;
 
 /**
  * Wrapper class for message received from a SQS queue and converted to an object
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/ExecuteWithRequestContext.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/ExecuteWithRequestContext.java
index 2666be1..7b49507 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/ExecuteWithRequestContext.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/ExecuteWithRequestContext.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.task;
+package com.softwaremill.common.task;
 
 import org.jboss.weld.context.bound.BoundRequestContext;
-import pl.softwaremill.common.util.dependency.D;
+import com.softwaremill.common.util.dependency.D;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/OneTimeTask.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/OneTimeTask.java
index 12b3c86..412d60d 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/OneTimeTask.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/OneTimeTask.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.task;
+package com.softwaremill.common.task;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/Task.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/Task.java
index 56e9160..d7fe093 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/Task.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/Task.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.task;
+package com.softwaremill.common.task;
 
 import java.io.Serializable;
 
diff --git a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/TaskExecutor.java b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/TaskExecutor.java
index 41ddc39..22bf901 100644
--- a/softwaremill-sqs/src/main/java/com/softwaremill/common/task/TaskExecutor.java
+++ b/softwaremill-sqs/src/main/java/com/softwaremill/common/task/TaskExecutor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.task;
+package com.softwaremill.common.task;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/SQSElasticMQIntegrationTest.java b/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/SQSElasticMQIntegrationTest.java
index 5fa77cb..47de131 100644
--- a/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/SQSElasticMQIntegrationTest.java
+++ b/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/SQSElasticMQIntegrationTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.services.sqs.AmazonSQS;
@@ -17,7 +17,7 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.util.Sleeper;
+import com.softwaremill.common.util.Sleeper;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
diff --git a/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/UtilTest.java b/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/UtilTest.java
index 480e7fd..616135d 100644
--- a/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/UtilTest.java
+++ b/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/UtilTest.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.sqs;
+package com.softwaremill.common.sqs;
 
 import com.amazonaws.Protocol;
 import org.testng.annotations.Test;
 
 import static org.fest.assertions.Assertions.assertThat;
-import static pl.softwaremill.common.sqs.Util.determineProtocol;
+import static com.softwaremill.common.sqs.Util.determineProtocol;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/task/SQSTaskTimerBeanElasticMQTest.java b/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/task/SQSTaskTimerBeanElasticMQTest.java
index 333f6d4..126e497 100644
--- a/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/task/SQSTaskTimerBeanElasticMQTest.java
+++ b/softwaremill-sqs/src/test/java/com/softwaremill/common/sqs/task/SQSTaskTimerBeanElasticMQTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.sqs.task;
+package com.softwaremill.common.sqs.task;
 
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.services.sqs.AmazonSQSClient;
@@ -15,20 +15,20 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.conf.Configuration;
-import pl.softwaremill.common.sqs.SQS;
-import pl.softwaremill.common.sqs.email.SendEmailTask;
-import pl.softwaremill.common.sqs.email.SendEmailTaskExecutor;
-import pl.softwaremill.common.sqs.util.EmailDescription;
-import pl.softwaremill.common.util.dependency.D;
+import com.softwaremill.common.conf.Configuration;
+import com.softwaremill.common.sqs.SQS;
+import com.softwaremill.common.sqs.email.SendEmailTask;
+import com.softwaremill.common.sqs.email.SendEmailTaskExecutor;
+import com.softwaremill.common.sqs.util.EmailDescription;
+import com.softwaremill.common.util.dependency.D;
 
 import java.util.Iterator;
 import java.util.concurrent.Callable;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static pl.softwaremill.common.sqs.SQSConfiguration.EMAIL_FROM;
-import static pl.softwaremill.common.sqs.SQSConfiguration.EMAIL_SMTP_PORT;
+import static com.softwaremill.common.sqs.SQSConfiguration.EMAIL_FROM;
+import static com.softwaremill.common.sqs.SQSConfiguration.EMAIL_SMTP_PORT;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-test/pom.xml b/softwaremill-test/pom.xml
index e99d58c..7e345b2 100644
--- a/softwaremill-test/pom.xml
+++ b/softwaremill-test/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>softwaremill-common-parent</artifactId>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <version>74-SNAPSHOT</version>
     </parent>
 
diff --git a/softwaremill-test/softwaremill-test-arquillian/pom.xml b/softwaremill-test/softwaremill-test-arquillian/pom.xml
index 8b8880f..5ec0464 100644
--- a/softwaremill-test/softwaremill-test-arquillian/pom.xml
+++ b/softwaremill-test/softwaremill-test-arquillian/pom.xml
@@ -4,7 +4,7 @@
     <name>Softwaremill Arqullian Test Util</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-test</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
diff --git a/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ArchiveUtil.java b/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ArchiveUtil.java
index 31af74e..a2c6072 100644
--- a/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ArchiveUtil.java
+++ b/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ArchiveUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.arquillian;
+package com.softwaremill.common.arquillian;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/BetterArquillian.java b/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/BetterArquillian.java
index 4d5c7d3..a331d08 100644
--- a/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/BetterArquillian.java
+++ b/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/BetterArquillian.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.arquillian;
+package com.softwaremill.common.arquillian;
 
 import org.jboss.arquillian.testng.Arquillian;
 import org.testng.IHookCallBack;
diff --git a/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ManifestUtil.java b/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ManifestUtil.java
index 7a04a71..2fd04ef 100644
--- a/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ManifestUtil.java
+++ b/softwaremill-test/softwaremill-test-arquillian/src/main/java/com/softwaremill/common/arquillian/ManifestUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.arquillian;
+package com.softwaremill.common.arquillian;
 
 import com.google.common.base.Charsets;
 import org.jboss.shrinkwrap.api.Archive;
diff --git a/softwaremill-test/softwaremill-test-db/README.md b/softwaremill-test/softwaremill-test-db/README.md
index 1466f9e..a710cd0 100644
--- a/softwaremill-test/softwaremill-test-db/README.md
+++ b/softwaremill-test/softwaremill-test-db/README.md
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-test-db</artifactId>
         <version>[VERSION]</version>
     </dependency>
diff --git a/softwaremill-test/softwaremill-test-db/pom.xml b/softwaremill-test/softwaremill-test-db/pom.xml
index 91e0047..3f1846a 100644
--- a/softwaremill-test/softwaremill-test-db/pom.xml
+++ b/softwaremill-test/softwaremill-test-db/pom.xml
@@ -4,7 +4,7 @@
     <name>Softwaremill DB Test</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-test</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -12,12 +12,12 @@
     <dependencies>
         <!-- Inter-modules dependencies -->
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-util</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-cdi</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -79,7 +79,7 @@
 
         <!-- Arquillian -->
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-test-arquillian</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/AbstractDBTest.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/AbstractDBTest.java
index c617ac2..049b224 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/AbstractDBTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/AbstractDBTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import com.google.common.io.Resources;
 import org.apache.log4j.BasicConfigurator;
@@ -15,10 +15,10 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
-import pl.softwaremill.common.arquillian.BetterArquillian;
-import pl.softwaremill.common.cdi.persistence.EntityManagerFactoryProducer;
-import pl.softwaremill.common.dbtest.util.DbMode;
-import pl.softwaremill.common.dbtest.util.SqlFileResolver;
+import com.softwaremill.common.arquillian.BetterArquillian;
+import com.softwaremill.common.cdi.persistence.EntityManagerFactoryProducer;
+import com.softwaremill.common.dbtest.util.DbMode;
+import com.softwaremill.common.dbtest.util.SqlFileResolver;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/ArchiveConfigurator.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/ArchiveConfigurator.java
index ec8e09e..fe7cbdd 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/ArchiveConfigurator.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/ArchiveConfigurator.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import com.google.common.base.Charsets;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import pl.softwaremill.common.cdi.persistence.EntityWriter;
-import pl.softwaremill.common.cdi.transaction.TransactionalInterceptor;
+import com.softwaremill.common.cdi.persistence.EntityWriter;
+import com.softwaremill.common.cdi.transaction.TransactionalInterceptor;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/DbConnector.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/DbConnector.java
index 5e2a43b..75cba6e 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/DbConnector.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/DbConnector.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import org.hibernate.cfg.Environment;
 import org.hibernate.ejb.AvailableSettings;
 import org.hibernate.ejb.Ejb3Configuration;
 import org.hibernate.testing.tm.ConnectionProviderImpl;
 import org.hibernate.testing.tm.TransactionManagerLookupImpl;
-import pl.softwaremill.common.dbtest.util.DbMode;
+import com.softwaremill.common.dbtest.util.DbMode;
 
 import javax.persistence.EntityManagerFactory;
 
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/MockitoPersistence.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/MockitoPersistence.java
index 65af402..52bf363 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/MockitoPersistence.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/MockitoPersistence.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import org.mockito.cglib.proxy.Factory;
 import org.mockito.invocation.InvocationOnMock;
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/TransactionalDBTest.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/TransactionalDBTest.java
index e373e1b..fe925ae 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/TransactionalDBTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/TransactionalDBTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import bitronix.tm.BitronixTransactionManager;
 import bitronix.tm.TransactionManagerServices;
@@ -19,11 +19,11 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
-import pl.softwaremill.common.arquillian.BetterArquillian;
-import pl.softwaremill.common.cdi.persistence.EntityManagerFactoryProducer;
-import pl.softwaremill.common.dbtest.util.DbMode;
-import pl.softwaremill.common.util.dependency.BeanManagerDependencyProvider;
-import pl.softwaremill.common.util.dependency.D;
+import com.softwaremill.common.arquillian.BetterArquillian;
+import com.softwaremill.common.cdi.persistence.EntityManagerFactoryProducer;
+import com.softwaremill.common.dbtest.util.DbMode;
+import com.softwaremill.common.util.dependency.BeanManagerDependencyProvider;
+import com.softwaremill.common.util.dependency.D;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/UtxDependencyProvider.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/UtxDependencyProvider.java
index 2fdca1b..73526ee 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/UtxDependencyProvider.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/UtxDependencyProvider.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import bitronix.tm.TransactionManagerServices;
-import pl.softwaremill.common.util.dependency.DependencyProvider;
+import com.softwaremill.common.util.dependency.DependencyProvider;
 
 import javax.transaction.UserTransaction;
 import java.lang.annotation.Annotation;
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/DbMode.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/DbMode.java
index 872d1c9..2e8e1fe 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/DbMode.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/DbMode.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest.util;
+package com.softwaremill.common.dbtest.util;
 
 /**
  * Created by Pawel Stawicki on Mar 31, 2011 9:38:46 PM
diff --git a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/SqlFileResolver.java b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/SqlFileResolver.java
index 93c3548..adbdb67 100644
--- a/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/SqlFileResolver.java
+++ b/softwaremill-test/softwaremill-test-db/src/main/java/com/softwaremill/common/dbtest/util/SqlFileResolver.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest.util;
+package com.softwaremill.common.dbtest.util;
 
 /**
  * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com)
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/DbConnectorTest.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/DbConnectorTest.java
index 907763f..3071d84 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/DbConnectorTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/DbConnectorTest.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.dbtest.util.DbMode;
+import com.softwaremill.common.dbtest.util.DbMode;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/Entity.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/Entity.java
index ca4edb4..cb11e50 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/Entity.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/Entity.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/EntityDAO.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/EntityDAO.java
index 756ad2b..4da2a67 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/EntityDAO.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/EntityDAO.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/MockitoPersistenceTest.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/MockitoPersistenceTest.java
index db6ce14..03b1204 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/MockitoPersistenceTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/MockitoPersistenceTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import org.testng.annotations.Test;
 
@@ -6,7 +6,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.*;
-import static pl.softwaremill.common.dbtest.MockitoPersistence.*;
+import static com.softwaremill.common.dbtest.MockitoPersistence.*;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1.java
index dff17a2..ff8d990 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
-import pl.softwaremill.common.util.persistance.Identifiable;
+import com.softwaremill.common.util.persistance.Identifiable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Manager.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Manager.java
index c851e3b..d166473 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Manager.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Manager.java
@@ -1,7 +1,7 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
-import pl.softwaremill.common.cdi.persistence.EntityWriter;
-import pl.softwaremill.common.cdi.transaction.Transactional;
+import com.softwaremill.common.cdi.persistence.EntityWriter;
+import com.softwaremill.common.cdi.transaction.Transactional;
 
 import javax.inject.Inject;
 import java.util.List;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Reader.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Reader.java
index 63ef522..75e6139 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Reader.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestEntity1Reader.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
-import pl.softwaremill.common.cdi.persistence.ReadOnly;
+import com.softwaremill.common.cdi.persistence.ReadOnly;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestOfDBTest.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestOfDBTest.java
index e6b10ca..7b085ab 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestOfDBTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestOfDBTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.jboss.arquillian.container.test.api.Deployment;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestTransactionalDBTest.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestTransactionalDBTest.java
index 6bf1167..16d5836 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestTransactionalDBTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TestTransactionalDBTest.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
 import org.hibernate.ejb.Ejb3Configuration;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.cdi.persistence.EntityWriter;
-import pl.softwaremill.common.cdi.persistence.ReadOnly;
-import pl.softwaremill.common.util.dependency.D;
+import com.softwaremill.common.cdi.persistence.EntityWriter;
+import com.softwaremill.common.cdi.persistence.ReadOnly;
+import com.softwaremill.common.util.dependency.D;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TransactionalEntity.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TransactionalEntity.java
index 21d8366..ffc8db9 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TransactionalEntity.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/TransactionalEntity.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.dbtest;
+package com.softwaremill.common.dbtest;
 
-import pl.softwaremill.common.util.persistance.Identifiable;
+import com.softwaremill.common.util.persistance.Identifiable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/util/SqlFileResolverTest.java b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/util/SqlFileResolverTest.java
index 2ecc5b1..5b7a184 100644
--- a/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/util/SqlFileResolverTest.java
+++ b/softwaremill-test/softwaremill-test-db/src/test/java/com/softwaremill/common/dbtest/util/SqlFileResolverTest.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.dbtest.util;
+package com.softwaremill.common.dbtest.util;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.dbtest.AbstractDBTest;
+import com.softwaremill.common.dbtest.AbstractDBTest;
 
 import static org.fest.assertions.Assertions.assertThat;
 
@@ -20,8 +20,8 @@ public void testResolveSqlFile(Class clazz, String expectedPath) throws Exceptio
 	@DataProvider
 	public Object[][] getClasses() {
 	    return new Object[][] {
-	        {AbstractDBTest.class, "pl/softwaremill/common/dbtest/AbstractDBTest.sql"},
-	        {SqlFileResolverTest.class, "pl/softwaremill/common/dbtest/util/SqlFileResolverTest.sql"},
+	        {AbstractDBTest.class, "com/softwaremill/common/dbtest/AbstractDBTest.sql"},
+	        {SqlFileResolverTest.class, "com/softwaremill/common/dbtest/util/SqlFileResolverTest.sql"},
 	    };
 	} 
 }
diff --git a/softwaremill-test/softwaremill-test-server/pom.xml b/softwaremill-test/softwaremill-test-server/pom.xml
index 4c9c1c4..2c56042 100644
--- a/softwaremill-test/softwaremill-test-server/pom.xml
+++ b/softwaremill-test/softwaremill-test-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>softwaremill-test</artifactId>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <version>74-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/LogAndStoreRequestResponder.java b/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/LogAndStoreRequestResponder.java
index a8e3be5..e0929e5 100644
--- a/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/LogAndStoreRequestResponder.java
+++ b/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/LogAndStoreRequestResponder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.testserver;
+package com.softwaremill.common.testserver;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
diff --git a/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/Responder.java b/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/Responder.java
index 2fbca5a..8e9dfcb 100644
--- a/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/Responder.java
+++ b/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/Responder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.testserver;
+package com.softwaremill.common.testserver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/TestServer.java b/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/TestServer.java
index 6f7be76..95a2574 100644
--- a/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/TestServer.java
+++ b/softwaremill-test/softwaremill-test-server/src/main/java/com/softwaremill/common/testserver/TestServer.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.testserver;
+package com.softwaremill.common.testserver;
 
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
diff --git a/softwaremill-test/softwaremill-test-server/src/test/java/com/softwaremill/common/testserver/TestServerTest.java b/softwaremill-test/softwaremill-test-server/src/test/java/com/softwaremill/common/testserver/TestServerTest.java
index 4156a7a..4cee7fb 100644
--- a/softwaremill-test/softwaremill-test-server/src/test/java/com/softwaremill/common/testserver/TestServerTest.java
+++ b/softwaremill-test/softwaremill-test-server/src/test/java/com/softwaremill/common/testserver/TestServerTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.testserver;
+package com.softwaremill.common.testserver;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
diff --git a/softwaremill-test/softwaremill-test-ui-swing/README.MD b/softwaremill-test/softwaremill-test-ui-swing/README.MD
index 2fc4068..564222e 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/README.MD
+++ b/softwaremill-test/softwaremill-test-ui-swing/README.MD
@@ -1,7 +1,7 @@
 Maven dependency:
 
 <dependency>
-    <groupId>pl.softwaremill.common</groupId>
+    <groupId>com.softwaremill.common</groupId>
     <artifactId>softwaremill-test-ui-swing</artifactId>
     <version>${current.version}</version>
 </dependency>
diff --git a/softwaremill-test/softwaremill-test-ui-swing/pom.xml b/softwaremill-test/softwaremill-test-ui-swing/pom.xml
index 4458e08..084eab0 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/pom.xml
+++ b/softwaremill-test/softwaremill-test-ui-swing/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>softwaremill-test</artifactId>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <version>74-SNAPSHOT</version>
     </parent>
 
diff --git a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/AbstractGUITest.java b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/AbstractGUITest.java
index 52c6737..916806e 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/AbstractGUITest.java
+++ b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/AbstractGUITest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.test.swing;
+package com.softwaremill.test.swing;
 
 import org.fest.swing.annotation.GUITest;
 import org.testng.annotations.Listeners;
diff --git a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/FileNameBuilder.java b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/FileNameBuilder.java
index da9201c..53ee8a0 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/FileNameBuilder.java
+++ b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/FileNameBuilder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.test.swing;
+package com.softwaremill.test.swing;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/GuiScreenShotTaker.java b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/GuiScreenShotTaker.java
index 45bf1b3..889f756 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/GuiScreenShotTaker.java
+++ b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/GuiScreenShotTaker.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.test.swing;
+package com.softwaremill.test.swing;
 
 import org.fest.swing.image.ImageException;
 import org.fest.swing.image.ScreenshotTaker;
diff --git a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/TeamCityScreenShotOnFailureListener.java b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/TeamCityScreenShotOnFailureListener.java
index ebf55d6..6594d44 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/TeamCityScreenShotOnFailureListener.java
+++ b/softwaremill-test/softwaremill-test-ui-swing/src/main/java/com/softwaremill/test/swing/TeamCityScreenShotOnFailureListener.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.test.swing;
+package com.softwaremill.test.swing;
 
 import org.fest.swing.testng.listener.AbstractTestListener;
 import org.testng.ITestResult;
diff --git a/softwaremill-test/softwaremill-test-ui-swing/src/test/java/com/softwaremill/test/swing/AppTest.java b/softwaremill-test/softwaremill-test-ui-swing/src/test/java/com/softwaremill/test/swing/AppTest.java
index fc172b8..b455cdf 100644
--- a/softwaremill-test/softwaremill-test-ui-swing/src/test/java/com/softwaremill/test/swing/AppTest.java
+++ b/softwaremill-test/softwaremill-test-ui-swing/src/test/java/com/softwaremill/test/swing/AppTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.test.swing;
+package com.softwaremill.test.swing;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/softwaremill-test/softwaremill-test-ui-web/README.md b/softwaremill-test/softwaremill-test-ui-web/README.md
index 9256e8f..99e38ea 100644
--- a/softwaremill-test/softwaremill-test-ui-web/README.md
+++ b/softwaremill-test/softwaremill-test-ui-web/README.md
@@ -1,7 +1,7 @@
 Maven dependency:
 
 <dependency>
-    <groupId>pl.softwaremill.common</groupId>
+    <groupId>com.softwaremill.common</groupId>
     <artifactId>softwaremill-test-ui-web</artifactId>
     <version>18</version>
 </dependency>
diff --git a/softwaremill-test/softwaremill-test-ui-web/pom.xml b/softwaremill-test/softwaremill-test-ui-web/pom.xml
index 717900a..9fa4aa1 100644
--- a/softwaremill-test/softwaremill-test-ui-web/pom.xml
+++ b/softwaremill-test/softwaremill-test-ui-web/pom.xml
@@ -4,7 +4,7 @@
     <name>Softwaremill Web UI Test</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-test</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
@@ -16,12 +16,12 @@
         </dependency>
 
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-util</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>pl.softwaremill.common</groupId>
+            <groupId>com.softwaremill.common</groupId>
             <artifactId>softwaremill-test-util</artifactId>
             <version>${version}</version>
         </dependency>
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/AbstractEmailServerRunner.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/AbstractEmailServerRunner.java
index f7f1bcb..17ae87c 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/AbstractEmailServerRunner.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/AbstractEmailServerRunner.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.test.web.email;
+package com.softwaremill.common.test.web.email;
 
 import com.dumbster.smtp.SimpleSmtpServer;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
-import pl.softwaremill.common.test.util.SimpleSmtpServerStarter;
+import com.softwaremill.common.test.util.SimpleSmtpServerStarter;
 
 
 /**
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailHeader.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailHeader.java
index 16923ee..3cc47f6 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailHeader.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailHeader.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.email;
+package com.softwaremill.common.test.web.email;
 
 /**
  * Most common headers available in email
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailInbox.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailInbox.java
index 70ce55b..6c1191c 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailInbox.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailInbox.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.email;
+package com.softwaremill.common.test.web.email;
 
 import com.dumbster.smtp.SmtpMessage;
 import com.google.common.base.Predicate;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailMessage.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailMessage.java
index 6aabef7..07fddce 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailMessage.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/email/EmailMessage.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.email;
+package com.softwaremill.common.test.web.email;
 
 import com.dumbster.smtp.SmtpMessage;
 import org.apache.commons.codec.DecoderException;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/AbstractJBossRunner.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/AbstractJBossRunner.java
index 6b37ba1..2e237b2 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/AbstractJBossRunner.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/AbstractJBossRunner.java
@@ -1,12 +1,12 @@
-package pl.softwaremill.common.test.web.jboss;
+package com.softwaremill.common.test.web.jboss;
 
 import org.apache.commons.io.FileUtils;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
-import pl.softwaremill.common.test.util.MessageWaiter;
-import pl.softwaremill.common.test.web.jboss.server.JBossAS;
-import pl.softwaremill.common.test.web.jboss.server.JBossASProvider;
-import pl.softwaremill.common.test.web.selenium.ServerProperties;
+import com.softwaremill.common.test.util.MessageWaiter;
+import com.softwaremill.common.test.web.jboss.server.JBossAS;
+import com.softwaremill.common.test.web.jboss.server.JBossASProvider;
+import com.softwaremill.common.test.web.selenium.ServerProperties;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/DeployementProperties.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/DeployementProperties.java
index e1708c6..a0f3464 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/DeployementProperties.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/DeployementProperties.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.jboss;
+package com.softwaremill.common.test.web.jboss;
 
 /**
  *
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/Deployment.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/Deployment.java
index c760d1e..d0ed49a 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/Deployment.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/Deployment.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.jboss;
+package com.softwaremill.common.test.web.jboss;
 
 /**
  * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com)
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/StandardDeployment.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/StandardDeployment.java
index bfb624c..6cb74a9 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/StandardDeployment.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/StandardDeployment.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.jboss;
+package com.softwaremill.common.test.web.jboss;
 
 import java.io.*;
 
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/SysoutLog.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/SysoutLog.java
index cd42854..b3904e6 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/SysoutLog.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/SysoutLog.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.jboss;
+package com.softwaremill.common.test.web.jboss;
 
 /**
  * @author Pawel Wrzeszcz (pawel [at] softwaremill . com)
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/AbstractJBossAS.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/AbstractJBossAS.java
index 812bc5c..dc2b25e 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/AbstractJBossAS.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/AbstractJBossAS.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.test.web.jboss.server;
+package com.softwaremill.common.test.web.jboss.server;
 
 import com.google.common.base.Charsets;
-import pl.softwaremill.common.test.util.MessageWaiter;
-import pl.softwaremill.common.test.web.jboss.SysoutLog;
-import pl.softwaremill.common.test.web.selenium.ServerProperties;
+import com.softwaremill.common.test.util.MessageWaiter;
+import com.softwaremill.common.test.web.jboss.SysoutLog;
+import com.softwaremill.common.test.web.selenium.ServerProperties;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS.java
index 1bf1fcf..17e5f53 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.jboss.server;
+package com.softwaremill.common.test.web.jboss.server;
 
 import java.io.IOException;
 
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS5or6.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS5or6.java
index f478b52..ba3d932 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS5or6.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS5or6.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.test.web.jboss.server;
+package com.softwaremill.common.test.web.jboss.server;
 
-import pl.softwaremill.common.test.web.selenium.ServerProperties;
+import com.softwaremill.common.test.web.selenium.ServerProperties;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS7.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS7.java
index 81e98a8..02379e7 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS7.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossAS7.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.test.web.jboss.server;
+package com.softwaremill.common.test.web.jboss.server;
 
-import pl.softwaremill.common.test.web.selenium.ServerProperties;
+import com.softwaremill.common.test.web.selenium.ServerProperties;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossASProvider.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossASProvider.java
index 34b0247..95c5c83 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossASProvider.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/jboss/server/JBossASProvider.java
@@ -1,6 +1,6 @@
-package pl.softwaremill.common.test.web.jboss.server;
+package com.softwaremill.common.test.web.jboss.server;
 
-import pl.softwaremill.common.test.web.selenium.ServerProperties;
+import com.softwaremill.common.test.web.selenium.ServerProperties;
 
 /**
  * @author Pawel Wrzeszcz (pawel [at] softwaremill . com)
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/AbstractSeleniumTest.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/AbstractSeleniumTest.java
index d8695d3..b70db64 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/AbstractSeleniumTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/AbstractSeleniumTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium;
+package com.softwaremill.common.test.web.selenium;
 
 import com.google.common.base.Charsets;
 import com.thoughtworks.selenium.Selenium;
@@ -11,8 +11,8 @@
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Listeners;
-import pl.softwaremill.common.test.web.selenium.screenshots.FailureTestListener;
-import pl.softwaremill.common.test.web.selenium.screenshots.Screenshotter;
+import com.softwaremill.common.test.web.selenium.screenshots.FailureTestListener;
+import com.softwaremill.common.test.web.selenium.screenshots.Screenshotter;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SMLSelenium.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SMLSelenium.java
index 3a6af48..4a30d37 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SMLSelenium.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SMLSelenium.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.test.web.selenium;
+package com.softwaremill.common.test.web.selenium;
 
 import com.thoughtworks.selenium.DefaultSelenium;
-import pl.softwaremill.common.test.web.selenium.screenshots.ScreenshotHttpCommandProcessor;
-import pl.softwaremill.common.test.web.selenium.screenshots.Screenshotter;
+import com.softwaremill.common.test.web.selenium.screenshots.ScreenshotHttpCommandProcessor;
+import com.softwaremill.common.test.web.selenium.screenshots.Screenshotter;
 
 /**
  * Selenium capable of doing screenshots
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumBrowserProperties.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumBrowserProperties.java
index ace6788..3e1e5ae 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumBrowserProperties.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumBrowserProperties.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium;
+package com.softwaremill.common.test.web.selenium;
 
 /**
  * Properties for selenium browser
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumCommands.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumCommands.java
index 168c980..3068c62 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumCommands.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/SeleniumCommands.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.test.web.selenium;
+package com.softwaremill.common.test.web.selenium;
 
 import org.testng.Assert;
 
 import java.util.Calendar;
 
-import static pl.softwaremill.common.test.web.selenium.AbstractSeleniumTest.selenium;
+import static com.softwaremill.common.test.web.selenium.AbstractSeleniumTest.selenium;
 
 /**
  * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com)
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/ServerProperties.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/ServerProperties.java
index 1af7ae2..0db01a1 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/ServerProperties.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/ServerProperties.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium;
+package com.softwaremill.common.test.web.selenium;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/FailureTestListener.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/FailureTestListener.java
index 95cefdd..d9388ff 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/FailureTestListener.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/FailureTestListener.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.test.web.selenium.screenshots;
+package com.softwaremill.common.test.web.selenium.screenshots;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
 import org.testng.TestListenerAdapter;
-import pl.softwaremill.common.test.web.selenium.AbstractSeleniumTest;
+import com.softwaremill.common.test.web.selenium.AbstractSeleniumTest;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/ScreenshotHttpCommandProcessor.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/ScreenshotHttpCommandProcessor.java
index d4d2e8c..3940221 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/ScreenshotHttpCommandProcessor.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/ScreenshotHttpCommandProcessor.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium.screenshots;
+package com.softwaremill.common.test.web.selenium.screenshots;
 
 import com.thoughtworks.selenium.CommandProcessor;
 import com.thoughtworks.selenium.HttpCommandProcessor;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/Screenshotter.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/Screenshotter.java
index d5a0302..33f8bec 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/Screenshotter.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/screenshots/Screenshotter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium.screenshots;
+package com.softwaremill.common.test.web.selenium.screenshots;
 
 /**
  * Screenshotter
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/testng/TeamcityTestNGNotifier.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/testng/TeamcityTestNGNotifier.java
index 844d549..1939685 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/testng/TeamcityTestNGNotifier.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/selenium/testng/TeamcityTestNGNotifier.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium.testng;
+package com.softwaremill.common.test.web.selenium.testng;
 
 import org.testng.ITestResult;
 import org.testng.TestListenerAdapter;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/AbstractWebServiceTest.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/AbstractWebServiceTest.java
index ed4132f..5e8f2a7 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/AbstractWebServiceTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/AbstractWebServiceTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.soap;
+package com.softwaremill.common.test.web.soap;
 
 import com.eviware.soapui.impl.wsdl.WsdlProject;
 import com.eviware.soapui.model.support.PropertiesMap;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/ArtifactPublisherListener.java b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/ArtifactPublisherListener.java
index cb3fcab..1f9355e 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/ArtifactPublisherListener.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/main/java/com/pl/softwaremill/common/test/web/soap/ArtifactPublisherListener.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.soap;
+package com.softwaremill.common.test.web.soap;
 
 import com.eviware.soapui.model.support.TestRunListenerAdapter;
 import com.eviware.soapui.model.testsuite.TestCaseRunContext;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/EmailMessageTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/EmailMessageTest.java
index 2f8d7f4..19d5587 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/EmailMessageTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/EmailMessageTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.email;
+package com.softwaremill.common.test.web.email;
 
 import com.dumbster.smtp.SmtpMessage;
 import org.testng.annotations.DataProvider;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/ScreenshotHttpCommandPRocessorTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/ScreenshotHttpCommandPRocessorTest.java
index f2b5ae6..67dae82 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/ScreenshotHttpCommandPRocessorTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/email/ScreenshotHttpCommandPRocessorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.email;
+package com.softwaremill.common.test.web.email;
 
 import com.thoughtworks.selenium.CommandProcessor;
 import org.mockito.Matchers;
@@ -6,8 +6,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.test.web.selenium.screenshots.ScreenshotHttpCommandProcessor;
-import pl.softwaremill.common.test.web.selenium.screenshots.Screenshotter;
+import com.softwaremill.common.test.web.selenium.screenshots.ScreenshotHttpCommandProcessor;
+import com.softwaremill.common.test.web.selenium.screenshots.Screenshotter;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/jboss/server/JBossASTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/jboss/server/JBossASTest.java
index c8d9c14..16ef797 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/jboss/server/JBossASTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/jboss/server/JBossASTest.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.test.web.jboss.server;
+package com.softwaremill.common.test.web.jboss.server;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.test.util.Execution;
-import pl.softwaremill.common.test.web.selenium.ServerProperties;
+import com.softwaremill.common.test.util.Execution;
+import com.softwaremill.common.test.web.selenium.ServerProperties;
 
 import java.util.Arrays;
 
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/ServerPropertiesTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/ServerPropertiesTest.java
index 10c1d25..53ffcca 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/ServerPropertiesTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/ServerPropertiesTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium;
+package com.softwaremill.common.test.web.selenium;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnSeleniumTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnSeleniumTest.java
index 7dcd32d..8c4ca98 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnSeleniumTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnSeleniumTest.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.test.web.selenium.screenshots;
+package com.softwaremill.common.test.web.selenium.screenshots;
 
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.BeforeTest;
-import pl.softwaremill.common.test.web.selenium.AbstractSeleniumTest;
+import com.softwaremill.common.test.web.selenium.AbstractSeleniumTest;
 
 /**
  * It isn't a real test class, it's used in {@link FailureTestListenerTest}
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnTest.java
index 49ac72f..f9a8d0c 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/AnTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium.screenshots;
+package com.softwaremill.common.test.web.selenium.screenshots;
 
 /**
  * It isn't a real test class, it's used in {@link FailureTestListenerTest}
diff --git a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/FailureTestListenerTest.java b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/FailureTestListenerTest.java
index 9d48359..32d2ba6 100644
--- a/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/FailureTestListenerTest.java
+++ b/softwaremill-test/softwaremill-test-ui-web/src/test/java/com/softwaremill/common/test/web/selenium/screenshots/FailureTestListenerTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.web.selenium.screenshots;
+package com.softwaremill.common.test.web.selenium.screenshots;
 
 import com.thoughtworks.selenium.Selenium;
 import org.testng.IClass;
@@ -6,7 +6,7 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.test.web.selenium.AbstractSeleniumTest;
+import com.softwaremill.common.test.web.selenium.AbstractSeleniumTest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/softwaremill-test/softwaremill-test-util/README.md b/softwaremill-test/softwaremill-test-util/README.md
index 55c71e2..5516ed3 100644
--- a/softwaremill-test/softwaremill-test-util/README.md
+++ b/softwaremill-test/softwaremill-test-util/README.md
@@ -3,7 +3,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-test-util</artifactId>
         <version>70</version>
     </dependency>
diff --git a/softwaremill-test/softwaremill-test-util/pom.xml b/softwaremill-test/softwaremill-test-util/pom.xml
index 682cba1..7e96158 100644
--- a/softwaremill-test/softwaremill-test-util/pom.xml
+++ b/softwaremill-test/softwaremill-test-util/pom.xml
@@ -4,7 +4,7 @@
     <name>Softwaremill Test Utils</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-test</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/AssertException.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/AssertException.java
index 229459b..c90abe3 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/AssertException.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/AssertException.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.testng.Assert;
 
-import static pl.softwaremill.common.test.util.AssertException.ExceptionMatch.EXCEPTION_CLASS_MUST_EQUAL;
+import static com.softwaremill.common.test.util.AssertException.ExceptionMatch.EXCEPTION_CLASS_MUST_EQUAL;
 
 /**
  * Allows expecting and intercepting exceptions in a nice way.
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/Execution.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/Execution.java
index 019fabb..ee74f0b 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/Execution.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/Execution.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 /**
  * Used in tests to get exception thrown by the closure provided in the <code>execute</code> method.
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/ExtMockito.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/ExtMockito.java
index 6a39c1e..c3423dd 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/ExtMockito.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/ExtMockito.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.mockito.cglib.proxy.Factory;
 
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/FileMessageWaiter.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/FileMessageWaiter.java
index c4e409f..a2e2b75 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/FileMessageWaiter.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/FileMessageWaiter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.apache.commons.io.input.Tailer;
 import org.apache.commons.io.input.TailerListenerAdapter;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MessageWaiter.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MessageWaiter.java
index a86ba81..7166a69 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MessageWaiter.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MessageWaiter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import com.google.common.base.Charsets;
 
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MockitoTestNGListener.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MockitoTestNGListener.java
index ece1754..53dae6e 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MockitoTestNGListener.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/MockitoTestNGListener.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.mockito.MockitoAnnotations;
 import org.testng.IInvokedMethod;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/SimpleSmtpServerStarter.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/SimpleSmtpServerStarter.java
index f3bc1d9..acd5dcc 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/SimpleSmtpServerStarter.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/SimpleSmtpServerStarter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import com.dumbster.smtp.SimpleSmtpServer;
 
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/OptionalConditions.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/OptionalConditions.java
index 403e18d..51dc5be 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/OptionalConditions.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/OptionalConditions.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.fest;
+package com.softwaremill.common.test.util.fest;
 
 import com.google.common.base.Optional;
 import org.fest.assertions.Condition;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/TimeAssertions.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/TimeAssertions.java
index da2d914..b39fc21 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/TimeAssertions.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/fest/TimeAssertions.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.fest;
+package com.softwaremill.common.test.util.fest;
 
 import org.fest.assertions.GenericAssert;
 import org.joda.time.DateTime;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/FirstTest.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/FirstTest.java
index d0c9661..820b7d9 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/FirstTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/FirstTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.reorder;
+package com.softwaremill.common.test.util.reorder;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/LastTest.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/LastTest.java
index 79e5203..86200b6 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/LastTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/LastTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.reorder;
+package com.softwaremill.common.test.util.reorder;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListener.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListener.java
index 6beabea..a193454 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListener.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListener.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.reorder;
+package com.softwaremill.common.test.util.reorder;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ArrayListMultimap;
diff --git a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestOrder.java b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestOrder.java
index 62b21c8..14c755a 100644
--- a/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestOrder.java
+++ b/softwaremill-test/softwaremill-test-util/src/main/java/com/softwaremill/common/test/util/reorder/TestOrder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.reorder;
+package com.softwaremill.common.test.util.reorder;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/AssertExceptionTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/AssertExceptionTest.java
index 9ec9a80..4718dad 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/AssertExceptionTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/AssertExceptionTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
-import static pl.softwaremill.common.test.util.AssertException.ExceptionMatch.EXCEPTION_CLASS_AND_MESSAGE_MUST_EQUAL;
-import static pl.softwaremill.common.test.util.AssertException.ExceptionMatch.EXCEPTION_MAY_BE_SUBCLASS_OF;
+import static com.softwaremill.common.test.util.AssertException.ExceptionMatch.EXCEPTION_CLASS_AND_MESSAGE_MUST_EQUAL;
+import static com.softwaremill.common.test.util.AssertException.ExceptionMatch.EXCEPTION_MAY_BE_SUBCLASS_OF;
 
 /**
  * Ironic test in which we check the "better way" of checking exceptions
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExecutionTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExecutionTest.java
index 6a9c0dd..e705597 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExecutionTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExecutionTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExtMockitoTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExtMockitoTest.java
index 47872c9..bc2c3af 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExtMockitoTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/ExtMockitoTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.testng.annotations.Test;
 
@@ -7,7 +7,7 @@
 import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-import static pl.softwaremill.common.test.util.ExtMockito.isAMock;
+import static com.softwaremill.common.test.util.ExtMockito.isAMock;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MessageWaitersTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MessageWaitersTest.java
index 1edcdc9..a4afba2 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MessageWaitersTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MessageWaitersTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MockitoTestNGListenerTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MockitoTestNGListenerTest.java
index 26cdcba..ba383e6 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MockitoTestNGListenerTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/MockitoTestNGListenerTest.java
@@ -1,10 +1,10 @@
-package pl.softwaremill.common.test.util;
+package com.softwaremill.common.test.util;
 
 import org.mockito.Mock;
 import org.mockito.internal.util.MockUtil;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.test.util.MockitoTestNGListener;
+import com.softwaremill.common.test.util.MockitoTestNGListener;
 
 import static org.fest.assertions.Assertions.assertThat;
 
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/OptionalConditionsTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/OptionalConditionsTest.java
index 809a213..0312c73 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/OptionalConditionsTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/OptionalConditionsTest.java
@@ -1,11 +1,11 @@
-package pl.softwaremill.common.test.util.fest;
+package com.softwaremill.common.test.util.fest;
 
 import com.google.common.base.Optional;
 import org.testng.annotations.Test;
 
 import static org.fest.assertions.Assertions.assertThat;
-import static pl.softwaremill.common.test.util.fest.OptionalConditions.absent;
-import static pl.softwaremill.common.test.util.fest.OptionalConditions.present;
+import static com.softwaremill.common.test.util.fest.OptionalConditions.absent;
+import static com.softwaremill.common.test.util.fest.OptionalConditions.present;
 
 /**
  * @author Maciej Bilas
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/TimeAssertionsTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/TimeAssertionsTest.java
index 62a7320..9459c2c 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/TimeAssertionsTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/fest/TimeAssertionsTest.java
@@ -1,14 +1,14 @@
-package pl.softwaremill.common.test.util.fest;
+package com.softwaremill.common.test.util.fest;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDateTime;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.test.util.AssertException;
+import com.softwaremill.common.test.util.AssertException;
 
 import java.util.Date;
 
-import static pl.softwaremill.common.test.util.fest.TimeAssertions.assertTime;
+import static com.softwaremill.common.test.util.fest.TimeAssertions.assertTime;
 
 public class TimeAssertionsTest {
 
diff --git a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListenerTest.java b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListenerTest.java
index cc05cc2..5ce71fa 100644
--- a/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListenerTest.java
+++ b/softwaremill-test/softwaremill-test-util/src/test/java/com/softwaremill/common/test/util/reorder/TestNGReorderingListenerTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.test.util.reorder;
+package com.softwaremill.common.test.util.reorder;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/softwaremill-util/README.md b/softwaremill-util/README.md
index 23280ec..c2aecec 100644
--- a/softwaremill-util/README.md
+++ b/softwaremill-util/README.md
@@ -1,7 +1,7 @@
 Maven dependency:
 
     <dependency>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-util</artifactId>
         <version>[VERSION]</version>
     </dependency>
@@ -14,7 +14,7 @@ Mainly a test utility, makes it easier to test beans which use field injection.
 of fields (having to provide the field name), it is enough to provide the target of the injection and the objects
 to be injected. For example:
 
-    import static pl.softwaremill.common.util.CDIInjector.*;
+    import static com.softwaremill.common.util.CDIInjector.*;
 
     @Test
     public void testSomething() {
diff --git a/softwaremill-util/pom.xml b/softwaremill-util/pom.xml
index db63f68..930595f 100644
--- a/softwaremill-util/pom.xml
+++ b/softwaremill-util/pom.xml
@@ -6,7 +6,7 @@
     <name>Softwaremill Util</name>
 
     <parent>
-        <groupId>pl.softwaremill.common</groupId>
+        <groupId>com.softwaremill.common</groupId>
         <artifactId>softwaremill-common-parent</artifactId>
         <version>74-SNAPSHOT</version>
     </parent>
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/CDIInjector.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/CDIInjector.java
index fb92ced..5f0d7fb 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/CDIInjector.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/CDIInjector.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import com.google.common.base.Predicates;
 import org.reflections.ReflectionUtils;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/ClassUtil.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/ClassUtil.java
index eb5c15d..6e7885b 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/ClassUtil.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/ClassUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/DateUtil.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/DateUtil.java
index 9cca965..c3b92c9 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/DateUtil.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/DateUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.joda.time.DateTime;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/EntityUtil.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/EntityUtil.java
index 80fa23b..fd85247 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/EntityUtil.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/EntityUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import javax.persistence.Column;
 import javax.persistence.ManyToMany;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/IncrementalSleeper.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/IncrementalSleeper.java
index c658594..4225b5c 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/IncrementalSleeper.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/IncrementalSleeper.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 /**
  * Suspends the current thread for exponentially increasing intervals of time, until the maximum sleep interval is
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/InfiniteSleeper.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/InfiniteSleeper.java
index 4f5320d..f32c28a 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/InfiniteSleeper.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/InfiniteSleeper.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 /**
  * @author Pawel Wrzeszcz (pawel [at] softwaremill . com)
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/NameValuePairBuilder.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/NameValuePairBuilder.java
index 68f5d0e..6dc0129 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/NameValuePairBuilder.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/NameValuePairBuilder.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import com.google.common.collect.Maps;
 import org.apache.http.NameValuePair;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/ObjectUtil.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/ObjectUtil.java
index 0978ffc..e8859c1 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/ObjectUtil.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/ObjectUtil.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/Option.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/Option.java
index 030e1c6..63cd312 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/Option.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/Option.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import java.util.Arrays;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichHexString.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichHexString.java
index c8ffc8d..9bd3383 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichHexString.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichHexString.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 /**
  * Wrapps a string that represents byte array in hex codes
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichList.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichList.java
index 6fba3d7..939dbfb 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichList.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichList.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichObject.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichObject.java
index 7d1d0b2..5158fd9 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichObject.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichObject.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichString.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichString.java
index e5c1ce5..9982ab0 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/RichString.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/RichString.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/SecsToMills.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/SecsToMills.java
index 23caea5..6a4b966 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/SecsToMills.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/SecsToMills.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 /**
  * Constants to avoid code comments like
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/Sleeper.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/Sleeper.java
index 335539d..a884538 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/Sleeper.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/Sleeper.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 public class Sleeper {
     public static void sleepFor(long millis) {
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/collect/Collections3.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/collect/Collections3.java
index b991bbe..914cdb4 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/collect/Collections3.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/collect/Collections3.java
@@ -1,8 +1,8 @@
-package pl.softwaremill.common.util.collect;
+package com.softwaremill.common.util.collect;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
-import pl.softwaremill.common.util.tuples.Pair;
+import com.softwaremill.common.util.tuples.Pair;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -12,7 +12,7 @@
 import static com.google.common.base.Predicates.not;
 import static com.google.common.base.Predicates.notNull;
 import static com.google.common.collect.Collections2.filter;
-import static pl.softwaremill.common.util.tuples.Pair.pair;
+import static com.softwaremill.common.util.tuples.Pair.pair;
 
 /**
  * Common {@link java.util.Collection} helper methods
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/AbstractDependencyProvider.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/AbstractDependencyProvider.java
index 6417d3e..bd9be10 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/AbstractDependencyProvider.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/AbstractDependencyProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/BeanManagerDependencyProvider.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/BeanManagerDependencyProvider.java
index 11947fb..f6eb298 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/BeanManagerDependencyProvider.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/BeanManagerDependencyProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/D.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/D.java
index a7818bb..804c9f9 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/D.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/D.java
@@ -1,9 +1,9 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import com.google.common.collect.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.softwaremill.common.util.ClassUtil;
+import com.softwaremill.common.util.ClassUtil;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/DependencyProvider.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/DependencyProvider.java
index 20557b7..2bfda0a 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/DependencyProvider.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/DependencyProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import java.lang.annotation.Annotation;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/GlobalDependencyProvider.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/GlobalDependencyProvider.java
index cd74796..bb7789b 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/GlobalDependencyProvider.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/GlobalDependencyProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/QualifiedDependency.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/QualifiedDependency.java
index e24a8dc..8679c9d 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/QualifiedDependency.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/QualifiedDependency.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/ThreadLocalDependencyProvider.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/ThreadLocalDependencyProvider.java
index ac5dca3..5b04486 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/ThreadLocalDependencyProvider.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/dependency/ThreadLocalDependencyProvider.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/DirFilenameFilter.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/DirFilenameFilter.java
index 540dbbc..2a5d313 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/DirFilenameFilter.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/DirFilenameFilter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/FileFilenameFilter.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/FileFilenameFilter.java
index 05ee800..bef03e9 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/FileFilenameFilter.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/FileFilenameFilter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/InputStreamInputSupplier.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/InputStreamInputSupplier.java
index a111c2a..bc611e2 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/InputStreamInputSupplier.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/InputStreamInputSupplier.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import com.google.common.io.InputSupplier;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/KillableProcess.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/KillableProcess.java
index c460b6e..52913dd 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/KillableProcess.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/KillableProcess.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichFile.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichFile.java
index 1a0880c..2911249 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichFile.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichFile.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import com.google.common.io.Files;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichStream.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichStream.java
index 4ee6841..6491393 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichStream.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/RichStream.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/Shell.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/Shell.java
index ae1bf3b..0d45652 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/io/Shell.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/io/Shell.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/persistance/Identifiable.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/persistance/Identifiable.java
index 46a5d36..c102886 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/persistance/Identifiable.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/persistance/Identifiable.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.persistance;
+package com.softwaremill.common.util.persistance;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparator.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparator.java
index ffe8386..f2dbd76 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparator.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparator.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.stringsorting;
+package com.softwaremill.common.util.stringsorting;
 
 import com.google.common.primitives.UnsignedBytes;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/SortedCharsToConsecutiveCharsAssigner.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/SortedCharsToConsecutiveCharsAssigner.java
index 21a1642..2c0281f 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/SortedCharsToConsecutiveCharsAssigner.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/SortedCharsToConsecutiveCharsAssigner.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.stringsorting;
+package com.softwaremill.common.util.stringsorting;
 
 import java.nio.charset.Charset;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/StringToByteSortableRepresentationConverter.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/StringToByteSortableRepresentationConverter.java
index 999d322..4906985 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/StringToByteSortableRepresentationConverter.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/stringsorting/StringToByteSortableRepresentationConverter.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.stringsorting;
+package com.softwaremill.common.util.stringsorting;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/system/ProcessKiller.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/system/ProcessKiller.java
index 7bf628b..0a1eb91 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/system/ProcessKiller.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/system/ProcessKiller.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.system;
+package com.softwaremill.common.util.system;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateContentData.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateContentData.java
index 7e28f0e..625af7c 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateContentData.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateContentData.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.templates;
+package com.softwaremill.common.util.templates;
 
 /**
  * Object with String data: subject and content
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateReader.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateReader.java
index 0e1e5f2..a2a0a5a 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateReader.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/templates/TemplateReader.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.templates;
+package com.softwaremill.common.util.templates;
 
 import com.google.common.io.Resources;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/time/Clock.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/time/Clock.java
index 7155477..17175c4 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/time/Clock.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/time/Clock.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.time;
+package com.softwaremill.common.util.time;
 
 import org.joda.time.DateTime;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/time/FixtureTimeClock.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/time/FixtureTimeClock.java
index 1fb2e78..de4ce35 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/time/FixtureTimeClock.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/time/FixtureTimeClock.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.time;
+package com.softwaremill.common.util.time;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/time/RealTimeClock.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/time/RealTimeClock.java
index d21a48b..8d66a37 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/time/RealTimeClock.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/time/RealTimeClock.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.time;
+package com.softwaremill.common.util.time;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/LexicographicPair.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/LexicographicPair.java
index 9b4e664..c219395 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/LexicographicPair.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/LexicographicPair.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.tuples;
+package com.softwaremill.common.util.tuples;
 
 import com.google.common.collect.Ordering;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/Pair.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/Pair.java
index 00d5c22..fbe7800 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/Pair.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/tuples/Pair.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.tuples;
+package com.softwaremill.common.util.tuples;
 
 import com.google.common.base.Function;
 
diff --git a/softwaremill-util/src/main/java/com/softwaremill/common/util/validation/NotJustWhitespace.java b/softwaremill-util/src/main/java/com/softwaremill/common/util/validation/NotJustWhitespace.java
index 3eec386..a8f0cfa 100644
--- a/softwaremill-util/src/main/java/com/softwaremill/common/util/validation/NotJustWhitespace.java
+++ b/softwaremill-util/src/main/java/com/softwaremill/common/util/validation/NotJustWhitespace.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.validation;
+package com.softwaremill.common.util.validation;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -24,7 +24,7 @@
 @NotEmpty
 @Pattern(regexp = "(?s).*?\\S+.*") // (?s) makes . match all - also newlines
 public @interface NotJustWhitespace {
-    String message() default "{pl.softwaremill.common.validator.NotJustWhitespace.message}";
+    String message() default "{com.softwaremill.common.validator.NotJustWhitespace.message}";
 
     Class<?>[] groups() default { };
 
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/CDIInjectorTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/CDIInjectorTest.java
index f3b4f65..3ed3ac5 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/CDIInjectorTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/CDIInjectorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.testng.annotations.Test;
 
@@ -10,7 +10,7 @@
 import java.lang.annotation.Target;
 
 import static org.fest.assertions.Assertions.*;
-import static pl.softwaremill.common.util.CDIInjector.*;
+import static com.softwaremill.common.util.CDIInjector.*;
 
 /**
  * @author Adam Warski (adam at warski dot org)
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/DateUtilTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/DateUtilTest.java
index c2924c0..837a8f6 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/DateUtilTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/DateUtilTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.joda.time.DateTime;
 import org.testng.annotations.Test;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/NameValuePairBuilderTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/NameValuePairBuilderTest.java
index 2b2a847..30e31ce 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/NameValuePairBuilderTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/NameValuePairBuilderTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.apache.http.NameValuePair;
 import org.testng.annotations.Test;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/ObjectUtilTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/ObjectUtilTest.java
index 35b221d..845990a 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/ObjectUtilTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/ObjectUtilTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import com.google.common.collect.Lists;
 import org.testng.annotations.DataProvider;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/RichHexStringTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/RichHexStringTest.java
index 9bc09da..c449271 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/RichHexStringTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/RichHexStringTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/RichObjectTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/RichObjectTest.java
index b28f792..1bace0a 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/RichObjectTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/RichObjectTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/RichStringTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/RichStringTest.java
index deca5ae..e587881 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/RichStringTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/RichStringTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util;
+package com.softwaremill.common.util;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/collect/Collections3Test.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/collect/Collections3Test.java
index 964a855..9b05d78 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/collect/Collections3Test.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/collect/Collections3Test.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.collect;
+package com.softwaremill.common.util.collect;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
@@ -6,7 +6,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import org.testng.annotations.Test;
-import pl.softwaremill.common.util.tuples.Pair;
+import com.softwaremill.common.util.tuples.Pair;
 
 import java.util.*;
 
@@ -14,8 +14,8 @@
 import static com.google.common.base.Predicates.alwaysTrue;
 import static org.fest.assertions.Assertions.assertThat;
 import static org.testng.Assert.*;
-import static pl.softwaremill.common.util.collect.Collections3.maxNullSafe;
-import static pl.softwaremill.common.util.collect.Collections3.partition;
+import static com.softwaremill.common.util.collect.Collections3.maxNullSafe;
+import static com.softwaremill.common.util.collect.Collections3.partition;
 
 /**
  * @author Maciej Biłas
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/AnotherTestQualifier.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/AnotherTestQualifier.java
index 6912ef1..aacfa6b 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/AnotherTestQualifier.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/AnotherTestQualifier.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/DTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/DTest.java
index 688e525..df1c061 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/DTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/DTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/FooAnnotatedClass.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/FooAnnotatedClass.java
index e8b9a55..87d1008 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/FooAnnotatedClass.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/FooAnnotatedClass.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 /**
  * Class to get the "real" qualifier from
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/TestQualifier.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/TestQualifier.java
index 0f0f8d6..a69893c 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/TestQualifier.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/dependency/TestQualifier.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.dependency;
+package com.softwaremill.common.util.dependency;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Retention;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/io/RichFileTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/io/RichFileTest.java
index 6c2c735..6151ea0 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/io/RichFileTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/io/RichFileTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.io;
+package com.softwaremill.common.util.io;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparatorTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparatorTest.java
index 960ef56..53fbb76 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparatorTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/stringsorting/ByteByByteStringComparatorTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.stringsorting;
+package com.softwaremill.common.util.stringsorting;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/templates/TemplateReaderTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/templates/TemplateReaderTest.java
index 6681541..8ea717e 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/templates/TemplateReaderTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/templates/TemplateReaderTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.templates;
+package com.softwaremill.common.util.templates;
 
 import org.testng.annotations.Test;
 
diff --git a/softwaremill-util/src/test/java/com/softwaremill/common/util/validation/NotJustWhitespaceTest.java b/softwaremill-util/src/test/java/com/softwaremill/common/util/validation/NotJustWhitespaceTest.java
index fa54f7c..72f6984 100644
--- a/softwaremill-util/src/test/java/com/softwaremill/common/util/validation/NotJustWhitespaceTest.java
+++ b/softwaremill-util/src/test/java/com/softwaremill/common/util/validation/NotJustWhitespaceTest.java
@@ -1,4 +1,4 @@
-package pl.softwaremill.common.util.validation;
+package com.softwaremill.common.util.validation;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;