diff --git a/owncloudComLib/build.gradle b/owncloud-android-library/build.gradle
similarity index 100%
rename from owncloudComLib/build.gradle
rename to owncloud-android-library/build.gradle
diff --git a/owncloudComLib/src/main/AndroidManifest.xml b/owncloud-android-library/src/main/AndroidManifest.xml
similarity index 100%
rename from owncloudComLib/src/main/AndroidManifest.xml
rename to owncloud-android-library/src/main/AndroidManifest.xml
diff --git a/owncloudComLib/src/main/java/lib/common/DynamicSessionManager.java b/owncloud-android-library/src/main/java/lib/common/DynamicSessionManager.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/DynamicSessionManager.java
rename to owncloud-android-library/src/main/java/lib/common/DynamicSessionManager.java
diff --git a/owncloudComLib/src/main/java/lib/common/OwnCloudAccount.java b/owncloud-android-library/src/main/java/lib/common/OwnCloudAccount.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/OwnCloudAccount.java
rename to owncloud-android-library/src/main/java/lib/common/OwnCloudAccount.java
diff --git a/owncloudComLib/src/main/java/lib/common/OwnCloudClient.java b/owncloud-android-library/src/main/java/lib/common/OwnCloudClient.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/OwnCloudClient.java
rename to owncloud-android-library/src/main/java/lib/common/OwnCloudClient.java
diff --git a/owncloudComLib/src/main/java/lib/common/OwnCloudClientFactory.java b/owncloud-android-library/src/main/java/lib/common/OwnCloudClientFactory.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/OwnCloudClientFactory.java
rename to owncloud-android-library/src/main/java/lib/common/OwnCloudClientFactory.java
diff --git a/owncloudComLib/src/main/java/lib/common/OwnCloudClientManager.java b/owncloud-android-library/src/main/java/lib/common/OwnCloudClientManager.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/OwnCloudClientManager.java
rename to owncloud-android-library/src/main/java/lib/common/OwnCloudClientManager.java
diff --git a/owncloudComLib/src/main/java/lib/common/OwnCloudClientManagerFactory.java b/owncloud-android-library/src/main/java/lib/common/OwnCloudClientManagerFactory.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/OwnCloudClientManagerFactory.java
rename to owncloud-android-library/src/main/java/lib/common/OwnCloudClientManagerFactory.java
diff --git a/owncloudComLib/src/main/java/lib/common/SimpleFactoryManager.java b/owncloud-android-library/src/main/java/lib/common/SimpleFactoryManager.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/SimpleFactoryManager.java
rename to owncloud-android-library/src/main/java/lib/common/SimpleFactoryManager.java
diff --git a/owncloudComLib/src/main/java/lib/common/SingleSessionManager.java b/owncloud-android-library/src/main/java/lib/common/SingleSessionManager.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/SingleSessionManager.java
rename to owncloud-android-library/src/main/java/lib/common/SingleSessionManager.java
diff --git a/owncloudComLib/src/main/java/lib/common/accounts/AccountTypeUtils.java b/owncloud-android-library/src/main/java/lib/common/accounts/AccountTypeUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/accounts/AccountTypeUtils.java
rename to owncloud-android-library/src/main/java/lib/common/accounts/AccountTypeUtils.java
diff --git a/owncloudComLib/src/main/java/lib/common/accounts/AccountUtils.java b/owncloud-android-library/src/main/java/lib/common/accounts/AccountUtils.java
similarity index 99%
rename from owncloudComLib/src/main/java/lib/common/accounts/AccountUtils.java
rename to owncloud-android-library/src/main/java/lib/common/accounts/AccountUtils.java
index 72126285..27d89dd0 100644
--- a/owncloudComLib/src/main/java/lib/common/accounts/AccountUtils.java
+++ b/owncloud-android-library/src/main/java/lib/common/accounts/AccountUtils.java
@@ -302,7 +302,7 @@ public class AccountUtils {
     public static class Constants {
         /**
          * Version should be 3 numbers separated by dot so it can be parsed by
-         * {@link com.owncloud.android.lib.resources.status.OwnCloudVersion}
+         * {@link OwnCloudVersion}
          */
         public static final String KEY_OC_VERSION = "oc_version";
         /**
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBasicCredentials.java b/owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudBasicCredentials.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBasicCredentials.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudBasicCredentials.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBearerCredentials.java b/owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudBearerCredentials.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/OwnCloudBearerCredentials.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudBearerCredentials.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentials.java b/owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudCredentials.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentials.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudCredentials.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentialsFactory.java b/owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudCredentialsFactory.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/OwnCloudCredentialsFactory.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudCredentialsFactory.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudSamlSsoCredentials.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/OwnCloudSamlSsoCredentials.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/OwnCloudSamlSsoCredentials.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/BearerCredentials.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/BearerCredentials.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/BearerCredentials.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/BearerCredentials.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ClientConfiguration.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2ClientConfiguration.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ClientConfiguration.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2ClientConfiguration.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Constants.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2Constants.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Constants.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2Constants.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GrantType.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2GrantType.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2GrantType.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2GrantType.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Provider.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2Provider.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2Provider.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2Provider.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2QueryParser.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2QueryParser.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2QueryParser.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2QueryParser.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RequestBuilder.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2RequestBuilder.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2RequestBuilder.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2RequestBuilder.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ResponseParser.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2ResponseParser.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OAuth2ResponseParser.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OAuth2ResponseParser.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java
diff --git a/owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/owncloud-android-library/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
rename to owncloud-android-library/src/main/java/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/HttpClient.java b/owncloud-android-library/src/main/java/lib/common/http/HttpClient.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/HttpClient.java
rename to owncloud-android-library/src/main/java/lib/common/http/HttpClient.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/HttpConstants.java b/owncloud-android-library/src/main/java/lib/common/http/HttpConstants.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/HttpConstants.java
rename to owncloud-android-library/src/main/java/lib/common/http/HttpConstants.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/interceptors/HttpInterceptor.java b/owncloud-android-library/src/main/java/lib/common/http/interceptors/HttpInterceptor.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/interceptors/HttpInterceptor.java
rename to owncloud-android-library/src/main/java/lib/common/http/interceptors/HttpInterceptor.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/interceptors/RequestHeaderInterceptor.java b/owncloud-android-library/src/main/java/lib/common/http/interceptors/RequestHeaderInterceptor.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/interceptors/RequestHeaderInterceptor.java
rename to owncloud-android-library/src/main/java/lib/common/http/interceptors/RequestHeaderInterceptor.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/HttpBaseMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/HttpBaseMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/HttpBaseMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/HttpBaseMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/DeleteMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/DeleteMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/DeleteMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/DeleteMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/GetMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/GetMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/GetMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/GetMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/HttpMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/HttpMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/HttpMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/HttpMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PostMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/PostMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PostMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/PostMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PutMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/PutMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/nonwebdav/PutMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/nonwebdav/PutMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/CopyMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/CopyMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/CopyMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/CopyMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavConstants.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/DavConstants.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavConstants.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/DavConstants.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/DavMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/DavMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavUtils.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/DavUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/DavUtils.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/DavUtils.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/MkColMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/MkColMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/MkColMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/MkColMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/MoveMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/MoveMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/MoveMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/MoveMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/PropfindMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/PropfindMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/PropfindMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/PropfindMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/http/methods/webdav/PutMethod.java b/owncloud-android-library/src/main/java/lib/common/http/methods/webdav/PutMethod.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/http/methods/webdav/PutMethod.java
rename to owncloud-android-library/src/main/java/lib/common/http/methods/webdav/PutMethod.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/AdvancedX509TrustManager.java b/owncloud-android-library/src/main/java/lib/common/network/AdvancedX509TrustManager.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/AdvancedX509TrustManager.java
rename to owncloud-android-library/src/main/java/lib/common/network/AdvancedX509TrustManager.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/CertificateCombinedException.java b/owncloud-android-library/src/main/java/lib/common/network/CertificateCombinedException.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/CertificateCombinedException.java
rename to owncloud-android-library/src/main/java/lib/common/network/CertificateCombinedException.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/ChunkFromFileRequestBody.java b/owncloud-android-library/src/main/java/lib/common/network/ChunkFromFileRequestBody.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/ChunkFromFileRequestBody.java
rename to owncloud-android-library/src/main/java/lib/common/network/ChunkFromFileRequestBody.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/FileRequestBody.java b/owncloud-android-library/src/main/java/lib/common/network/FileRequestBody.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/FileRequestBody.java
rename to owncloud-android-library/src/main/java/lib/common/network/FileRequestBody.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/NetworkUtils.java b/owncloud-android-library/src/main/java/lib/common/network/NetworkUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/NetworkUtils.java
rename to owncloud-android-library/src/main/java/lib/common/network/NetworkUtils.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/OnDatatransferProgressListener.java b/owncloud-android-library/src/main/java/lib/common/network/OnDatatransferProgressListener.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/OnDatatransferProgressListener.java
rename to owncloud-android-library/src/main/java/lib/common/network/OnDatatransferProgressListener.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/ProgressiveDataTransferer.java b/owncloud-android-library/src/main/java/lib/common/network/ProgressiveDataTransferer.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/ProgressiveDataTransferer.java
rename to owncloud-android-library/src/main/java/lib/common/network/ProgressiveDataTransferer.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/RedirectionPath.java b/owncloud-android-library/src/main/java/lib/common/network/RedirectionPath.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/RedirectionPath.java
rename to owncloud-android-library/src/main/java/lib/common/network/RedirectionPath.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/ServerNameIndicator.java b/owncloud-android-library/src/main/java/lib/common/network/ServerNameIndicator.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/ServerNameIndicator.java
rename to owncloud-android-library/src/main/java/lib/common/network/ServerNameIndicator.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/WebdavUtils.java b/owncloud-android-library/src/main/java/lib/common/network/WebdavUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/WebdavUtils.java
rename to owncloud-android-library/src/main/java/lib/common/network/WebdavUtils.java
diff --git a/owncloudComLib/src/main/java/lib/common/network/WriteTimeoutEnforcer.java b/owncloud-android-library/src/main/java/lib/common/network/WriteTimeoutEnforcer.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/network/WriteTimeoutEnforcer.java
rename to owncloud-android-library/src/main/java/lib/common/network/WriteTimeoutEnforcer.java
diff --git a/owncloudComLib/src/main/java/lib/common/operations/ErrorMessageParser.java b/owncloud-android-library/src/main/java/lib/common/operations/ErrorMessageParser.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/operations/ErrorMessageParser.java
rename to owncloud-android-library/src/main/java/lib/common/operations/ErrorMessageParser.java
diff --git a/owncloudComLib/src/main/java/lib/common/operations/InvalidCharacterExceptionParser.java b/owncloud-android-library/src/main/java/lib/common/operations/InvalidCharacterExceptionParser.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/operations/InvalidCharacterExceptionParser.java
rename to owncloud-android-library/src/main/java/lib/common/operations/InvalidCharacterExceptionParser.java
diff --git a/owncloudComLib/src/main/java/lib/common/operations/OnRemoteOperationListener.java b/owncloud-android-library/src/main/java/lib/common/operations/OnRemoteOperationListener.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/operations/OnRemoteOperationListener.java
rename to owncloud-android-library/src/main/java/lib/common/operations/OnRemoteOperationListener.java
diff --git a/owncloudComLib/src/main/java/lib/common/operations/OperationCancelledException.java b/owncloud-android-library/src/main/java/lib/common/operations/OperationCancelledException.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/operations/OperationCancelledException.java
rename to owncloud-android-library/src/main/java/lib/common/operations/OperationCancelledException.java
diff --git a/owncloudComLib/src/main/java/lib/common/operations/RemoteOperation.java b/owncloud-android-library/src/main/java/lib/common/operations/RemoteOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/operations/RemoteOperation.java
rename to owncloud-android-library/src/main/java/lib/common/operations/RemoteOperation.java
diff --git a/owncloudComLib/src/main/java/lib/common/operations/RemoteOperationResult.java b/owncloud-android-library/src/main/java/lib/common/operations/RemoteOperationResult.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/operations/RemoteOperationResult.java
rename to owncloud-android-library/src/main/java/lib/common/operations/RemoteOperationResult.java
diff --git a/owncloudComLib/src/main/java/lib/common/utils/Log_OC.java b/owncloud-android-library/src/main/java/lib/common/utils/Log_OC.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/utils/Log_OC.java
rename to owncloud-android-library/src/main/java/lib/common/utils/Log_OC.java
diff --git a/owncloudComLib/src/main/java/lib/common/utils/RandomUtils.java b/owncloud-android-library/src/main/java/lib/common/utils/RandomUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/common/utils/RandomUtils.java
rename to owncloud-android-library/src/main/java/lib/common/utils/RandomUtils.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/CopyRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/CopyRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/CopyRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/CopyRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/CreateRemoteFolderOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/CreateRemoteFolderOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/CreateRemoteFolderOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/CreateRemoteFolderOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/DownloadRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/DownloadRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/DownloadRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/DownloadRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/ExistenceCheckRemoteOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/ExistenceCheckRemoteOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/ExistenceCheckRemoteOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/ExistenceCheckRemoteOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/FileUtils.java b/owncloud-android-library/src/main/java/lib/resources/files/FileUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/FileUtils.java
rename to owncloud-android-library/src/main/java/lib/resources/files/FileUtils.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/MoveRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/MoveRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/MoveRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/MoveRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/ReadRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/ReadRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFolderOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/ReadRemoteFolderOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/ReadRemoteFolderOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/ReadRemoteFolderOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/RemoteFile.java b/owncloud-android-library/src/main/java/lib/resources/files/RemoteFile.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/RemoteFile.java
rename to owncloud-android-library/src/main/java/lib/resources/files/RemoteFile.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/RemoveRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/RemoveRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/RemoveRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/RemoveRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/RenameRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/RenameRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/RenameRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/RenameRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/UploadRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/UploadRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/UploadRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/UploadRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java b/owncloud-android-library/src/main/java/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/CreateRemoteShareOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/CreateRemoteShareOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/CreateRemoteShareOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/CreateRemoteShareOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteShareOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteShareOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareesOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteShareesOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/GetRemoteShareesOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteShareesOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesForFileOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteSharesForFileOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesForFileOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteSharesForFileOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteSharesOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/GetRemoteSharesOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/GetRemoteSharesOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/OCShare.java b/owncloud-android-library/src/main/java/lib/resources/shares/OCShare.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/OCShare.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/OCShare.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/RemoveRemoteShareOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/RemoveRemoteShareOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/RemoveRemoteShareOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/RemoveRemoteShareOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/ShareParserResult.java b/owncloud-android-library/src/main/java/lib/resources/shares/ShareParserResult.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/ShareParserResult.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/ShareParserResult.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/SharePermissionsBuilder.java b/owncloud-android-library/src/main/java/lib/resources/shares/SharePermissionsBuilder.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/SharePermissionsBuilder.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/SharePermissionsBuilder.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/ShareToRemoteOperationResultParser.java b/owncloud-android-library/src/main/java/lib/resources/shares/ShareToRemoteOperationResultParser.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/ShareToRemoteOperationResultParser.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/ShareToRemoteOperationResultParser.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/ShareType.java b/owncloud-android-library/src/main/java/lib/resources/shares/ShareType.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/ShareType.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/ShareType.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/ShareUtils.java b/owncloud-android-library/src/main/java/lib/resources/shares/ShareUtils.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/ShareUtils.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/ShareUtils.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/ShareXMLParser.java b/owncloud-android-library/src/main/java/lib/resources/shares/ShareXMLParser.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/ShareXMLParser.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/ShareXMLParser.java
diff --git a/owncloudComLib/src/main/java/lib/resources/shares/UpdateRemoteShareOperation.java b/owncloud-android-library/src/main/java/lib/resources/shares/UpdateRemoteShareOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/shares/UpdateRemoteShareOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/shares/UpdateRemoteShareOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/status/CapabilityBooleanType.java b/owncloud-android-library/src/main/java/lib/resources/status/CapabilityBooleanType.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/status/CapabilityBooleanType.java
rename to owncloud-android-library/src/main/java/lib/resources/status/CapabilityBooleanType.java
diff --git a/owncloudComLib/src/main/java/lib/resources/status/GetRemoteCapabilitiesOperation.java b/owncloud-android-library/src/main/java/lib/resources/status/GetRemoteCapabilitiesOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/status/GetRemoteCapabilitiesOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/status/GetRemoteCapabilitiesOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/status/GetRemoteStatusOperation.java b/owncloud-android-library/src/main/java/lib/resources/status/GetRemoteStatusOperation.java
similarity index 94%
rename from owncloudComLib/src/main/java/lib/resources/status/GetRemoteStatusOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/status/GetRemoteStatusOperation.java
index 8ac8480e..9896eb44 100644
--- a/owncloudComLib/src/main/java/lib/resources/status/GetRemoteStatusOperation.java
+++ b/owncloud-android-library/src/main/java/lib/resources/status/GetRemoteStatusOperation.java
@@ -52,7 +52,7 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David González Verdugo
  */
 
-public class GetRemoteStatusOperation extends RemoteOperation<com.owncloud.android.lib.resources.status.OwnCloudVersion> {
+public class GetRemoteStatusOperation extends RemoteOperation<OwnCloudVersion> {
 
     /**
      * Maximum time to wait for a response from the server when the connection is being tested,
@@ -67,7 +67,7 @@ public class GetRemoteStatusOperation extends RemoteOperation<com.owncloud.andro
     private static final String HTTPS_PREFIX = "https://";
     private static final String HTTP_PREFIX = "http://";
 
-    private RemoteOperationResult<com.owncloud.android.lib.resources.status.OwnCloudVersion> mLatestResult;
+    private RemoteOperationResult<OwnCloudVersion> mLatestResult;
     private Context mContext;
 
     public GetRemoteStatusOperation(Context context) {
@@ -122,7 +122,7 @@ public class GetRemoteStatusOperation extends RemoteOperation<com.owncloud.andro
                             RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
                 } else {
                     String version = respJSON.getString(NODE_VERSION);
-                    com.owncloud.android.lib.resources.status.OwnCloudVersion ocVersion = new com.owncloud.android.lib.resources.status.OwnCloudVersion(version);
+                    OwnCloudVersion ocVersion = new OwnCloudVersion(version);
                     /// the version object will be returned even if the version is invalid, no error code;
                     /// every app will decide how to act if (ocVersion.isVersionValid() == false)
 
@@ -175,7 +175,7 @@ public class GetRemoteStatusOperation extends RemoteOperation<com.owncloud.andro
     }
 
     @Override
-    protected RemoteOperationResult<com.owncloud.android.lib.resources.status.OwnCloudVersion> run(OwnCloudClient client) {
+    protected RemoteOperationResult<OwnCloudVersion> run(OwnCloudClient client) {
         if (!isOnline()) {
             return new RemoteOperationResult<>(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
         }
diff --git a/owncloudComLib/src/main/java/lib/resources/status/OCCapability.java b/owncloud-android-library/src/main/java/lib/resources/status/OCCapability.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/status/OCCapability.java
rename to owncloud-android-library/src/main/java/lib/resources/status/OCCapability.java
diff --git a/owncloudComLib/src/main/java/lib/resources/status/OwnCloudVersion.java b/owncloud-android-library/src/main/java/lib/resources/status/OwnCloudVersion.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/status/OwnCloudVersion.java
rename to owncloud-android-library/src/main/java/lib/resources/status/OwnCloudVersion.java
diff --git a/owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserAvatarOperation.java b/owncloud-android-library/src/main/java/lib/resources/users/GetRemoteUserAvatarOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserAvatarOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/users/GetRemoteUserAvatarOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserInfoOperation.java b/owncloud-android-library/src/main/java/lib/resources/users/GetRemoteUserInfoOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserInfoOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/users/GetRemoteUserInfoOperation.java
diff --git a/owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserQuotaOperation.java b/owncloud-android-library/src/main/java/lib/resources/users/GetRemoteUserQuotaOperation.java
similarity index 100%
rename from owncloudComLib/src/main/java/lib/resources/users/GetRemoteUserQuotaOperation.java
rename to owncloud-android-library/src/main/java/lib/resources/users/GetRemoteUserQuotaOperation.java
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index 0b7c8449..2c6a702a 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    implementation project(':owncloudComLib')
+    implementation project(':owncloud-android-library')
 }
 
 android {
diff --git a/settings.gradle b/settings.gradle
index 17d796c8..365861dc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include ':owncloudComLib'
+include ':owncloud-android-library'
 include ':sample_client'
\ No newline at end of file