diff --git a/src/assemble/connector.xml b/src/assemble/connector.xml
index cd55def..0ee1f58 100644
--- a/src/assemble/connector.xml
+++ b/src/assemble/connector.xml
@@ -40,6 +40,9 @@
     <fileSet>
       <directory>${project.build.directory}/classes</directory>
       <outputDirectory></outputDirectory>
+      <excludes>
+        <exclude>net/tirasa/connid/bundles/googleapps/credentialsgenerator/*.*</exclude>
+      </excludes>
     </fileSet>
 
     <fileSet>
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/CodeProcessorServlet.java b/src/main/java/net/tirasa/connid/bundles/googleapps/credentialsgenerator/CodeProcessorServlet.java
similarity index 97%
rename from src/main/java/net/tirasa/connid/bundles/googleapps/CodeProcessorServlet.java
rename to src/main/java/net/tirasa/connid/bundles/googleapps/credentialsgenerator/CodeProcessorServlet.java
index 17b18b8..8972f98 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/CodeProcessorServlet.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/credentialsgenerator/CodeProcessorServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.tirasa.connid.bundles.googleapps;
+package net.tirasa.connid.bundles.googleapps.credentialsgenerator;
 
 import com.google.api.client.auth.oauth2.AuthorizationCodeResponseUrl;
 import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeTokenRequest;
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/CredentialsGeneratorApplication.java b/src/main/java/net/tirasa/connid/bundles/googleapps/credentialsgenerator/CredentialsGeneratorApplication.java
similarity index 98%
rename from src/main/java/net/tirasa/connid/bundles/googleapps/CredentialsGeneratorApplication.java
rename to src/main/java/net/tirasa/connid/bundles/googleapps/credentialsgenerator/CredentialsGeneratorApplication.java
index 61a2771..6d6467c 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/CredentialsGeneratorApplication.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/credentialsgenerator/CredentialsGeneratorApplication.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.tirasa.connid.bundles.googleapps;
+package net.tirasa.connid.bundles.googleapps.credentialsgenerator;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeRequestUrl;
 import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;