diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java
similarity index 96%
rename from mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java
index be1a22057..f76d226a6 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/AuditApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/AuditsApiResource.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.mifosplatform.audit.api;
+package org.mifosplatform.commands.api;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -21,9 +21,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosplatform.audit.data.AuditData;
-import org.mifosplatform.audit.data.AuditSearchData;
-import org.mifosplatform.audit.service.AuditReadPlatformService;
+import org.mifosplatform.commands.data.AuditData;
+import org.mifosplatform.commands.data.AuditSearchData;
+import org.mifosplatform.commands.service.AuditReadPlatformService;
 import org.mifosplatform.infrastructure.core.api.ApiParameterHelper;
 import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper;
 import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
 @Path("/audits")
 @Component
 @Scope("singleton")
-public class AuditApiResource {
+public class AuditsApiResource {
 
 	private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(
 			Arrays.asList("id", "actionName", "entityName", "resourceId", "subresourceId",
@@ -52,7 +52,7 @@ public class AuditApiResource {
 	private final DefaultToApiJsonSerializer<AuditSearchData> toApiJsonSerializerSearchTemplate;
 
 	@Autowired
-	public AuditApiResource(
+	public AuditsApiResource(
 			final PlatformSecurityContext context,
 			final AuditReadPlatformService auditReadPlatformService,
 			final ApiRequestParameterHelper apiRequestParameterHelper,
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java
similarity index 94%
rename from mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java
index c91bbd3c5..a53994c11 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/api/MakercheckersApiResource.java
@@ -23,10 +23,10 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosplatform.audit.data.AuditData;
-import org.mifosplatform.audit.data.AuditSearchData;
-import org.mifosplatform.audit.service.AuditReadPlatformService;
+import org.mifosplatform.commands.data.AuditData;
+import org.mifosplatform.commands.data.AuditSearchData;
 import org.mifosplatform.commands.data.CommandSourceData;
+import org.mifosplatform.commands.service.AuditReadPlatformService;
 import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.mifosplatform.infrastructure.core.api.ApiRequestParameterHelper;
 import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Component;
 @Path("/makercheckers")
 @Component
 @Scope("singleton")
-public class CommandsApiResource {
+public class MakercheckersApiResource {
 
 	private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<String>(
 			Arrays.asList("id", "actionName", "entityName", "resourceId", "subresourceId",
@@ -58,7 +58,7 @@ public class CommandsApiResource {
     private final PortfolioCommandSourceWritePlatformService writePlatformService;
 
     @Autowired
-    public CommandsApiResource(final PlatformSecurityContext context, final AuditReadPlatformService readPlatformService, 
+    public MakercheckersApiResource(final PlatformSecurityContext context, final AuditReadPlatformService readPlatformService, 
             final DefaultToApiJsonSerializer<CommandSourceData> toApiJsonSerializer, final DefaultToApiJsonSerializer<AuditData> toApiJsonSerializerAudit, 
             final DefaultToApiJsonSerializer<AuditSearchData> toApiJsonSerializerSearchTemplate,
             final ApiRequestParameterHelper apiRequestParameterHelper, final PortfolioCommandSourceWritePlatformService writePlatformService) {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/data/AuditData.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
similarity index 98%
rename from mifosng-provider/src/main/java/org/mifosplatform/audit/data/AuditData.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
index 1b236c320..af059a467 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/audit/data/AuditData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditData.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.mifosplatform.audit.data;
+package org.mifosplatform.commands.data;
 
 import org.joda.time.DateTime;
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/data/AuditSearchData.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditSearchData.java
similarity index 92%
rename from mifosng-provider/src/main/java/org/mifosplatform/audit/data/AuditSearchData.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditSearchData.java
index 0701cbd68..a7af851f6 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/audit/data/AuditSearchData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/AuditSearchData.java
@@ -3,12 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.mifosplatform.audit.data;
+package org.mifosplatform.commands.data;
 
 import java.util.Collection;
 import java.util.List;
 
-import org.mifosplatform.audit.api.ProcessingResultLookup;
 import org.mifosplatform.useradministration.data.AppUserData;
 
 /**
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/ProcessingResultLookup.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/ProcessingResultLookup.java
similarity index 94%
rename from mifosng-provider/src/main/java/org/mifosplatform/audit/api/ProcessingResultLookup.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/data/ProcessingResultLookup.java
index 0bf93be1a..275569067 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/audit/api/ProcessingResultLookup.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/data/ProcessingResultLookup.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.mifosplatform.audit.api;
+package org.mifosplatform.commands.data;
 
 /**
  * Immutable data object for application user data.
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/service/AuditReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformService.java
similarity index 78%
rename from mifosng-provider/src/main/java/org/mifosplatform/audit/service/AuditReadPlatformService.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformService.java
index 77b2014d6..e1d40bce1 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/audit/service/AuditReadPlatformService.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformService.java
@@ -3,12 +3,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.mifosplatform.audit.service;
+package org.mifosplatform.commands.service;
 
 import java.util.Collection;
 
-import org.mifosplatform.audit.data.AuditData;
-import org.mifosplatform.audit.data.AuditSearchData;
+import org.mifosplatform.commands.data.AuditData;
+import org.mifosplatform.commands.data.AuditSearchData;
 
 public interface AuditReadPlatformService {
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/audit/service/AuditReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
similarity index 97%
rename from mifosng-provider/src/main/java/org/mifosplatform/audit/service/AuditReadPlatformServiceImpl.java
rename to mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
index cd84385f6..1a44c7a2d 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/audit/service/AuditReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/AuditReadPlatformServiceImpl.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.mifosplatform.audit.service;
+package org.mifosplatform.commands.service;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -12,9 +12,9 @@ import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
-import org.mifosplatform.audit.api.ProcessingResultLookup;
-import org.mifosplatform.audit.data.AuditData;
-import org.mifosplatform.audit.data.AuditSearchData;
+import org.mifosplatform.commands.data.AuditData;
+import org.mifosplatform.commands.data.AuditSearchData;
+import org.mifosplatform.commands.data.ProcessingResultLookup;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
diff --git a/mifosng-provider/src/main/pentahoReports/desktop.ini b/mifosng-provider/src/main/pentahoReports/desktop.ini
new file mode 100644
index 000000000..ab17096ea
--- /dev/null
+++ b/mifosng-provider/src/main/pentahoReports/desktop.ini
@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Documents