restructure into accounting, portfolio, organisation, user administration and infrastructure related packages.

mifosng-provider/src/main/java/org/mifosplatform/accounting/domain/GLClosure.java

@@ -15,8 +15,8 @@ import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
 import org.mifosplatform.accounting.api.commands.GLClosureCommand;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
-import org.mifosplatform.infrastructure.office.domain.Office;
+import org.mifosplatform.organisation.office.domain.Office;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "acc_gl_closure", uniqueConstraints = { @UniqueConstraint(columnNames = { "office_id", "closing_date" }, name = "office_id_closing_date") })

mifosng-provider/src/main/java/org/mifosplatform/accounting/service/impl/GLClosureWritePlatformServiceJpaRepositoryImpl.java

@@ -8,9 +8,9 @@ import org.mifosplatform.accounting.exceptions.GLClosureNotFoundException;
 import org.mifosplatform.accounting.service.GLClosureCommandValidator;
 import org.mifosplatform.accounting.service.GLClosureWritePlatformService;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
-import org.mifosplatform.infrastructure.office.domain.Office;
+import org.mifosplatform.organisation.office.domain.Office;
-import org.mifosplatform.infrastructure.office.domain.OfficeRepository;
+import org.mifosplatform.organisation.office.domain.OfficeRepository;
-import org.mifosplatform.infrastructure.office.exception.OfficeNotFoundException;
+import org.mifosplatform.organisation.office.exception.OfficeNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/commands/api/CommandsApiResource.java

@@ -16,7 +16,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosplatform.commands.api.data.CommandSourceData;
+import org.mifosplatform.commands.data.CommandSourceData;
 import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.mifosplatform.commands.service.PortfolioCommandsReadPlatformService;
 import org.mifosplatform.infrastructure.core.api.ApiParameterHelper;

mifosng-provider/src/main/java/org/mifosplatform/commands/data/CommandSourceData.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.commands.api.data;
+package org.mifosplatform.commands.data;
 
 import org.joda.time.LocalDate;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/domain/CommandSource.java

@@ -12,7 +12,7 @@ import javax.persistence.TemporalType;
 
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 @Entity

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/ChargeDefinitionCommandHandler.java

@@ -8,10 +8,10 @@ import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
 import org.mifosplatform.portfolio.charge.service.ChargeWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/ClientCommandHandler.java

@@ -9,10 +9,10 @@ import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.command.ClientCommand;
 import org.mifosplatform.portfolio.client.service.ClientWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/ClientIdentifierCommandHandler.java

@@ -9,10 +9,10 @@ import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
 import org.mifosplatform.portfolio.client.service.ClientWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CodeCommandHandler.java

@@ -10,8 +10,8 @@ import org.mifosplatform.infrastructure.codes.command.CodeCommand;
 import org.mifosplatform.infrastructure.codes.service.CodeWritePlatformService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/CurrencyCommandHandler.java

@@ -7,12 +7,12 @@ import org.joda.time.LocalDate;
 import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.service.ChangeDetectionService;
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.configuration.service.CurrencyWritePlatformService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
+import org.mifosplatform.organisation.monetary.service.CurrencyWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/FundCommandHandler.java

@@ -9,10 +9,10 @@ import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.mifosplatform.portfolio.fund.command.FundCommand;
 import org.mifosplatform.portfolio.fund.service.FundWritePlatformService;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/LoanProductCommandHandler.java

@@ -10,10 +10,10 @@ import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.mifosplatform.portfolio.loanproduct.command.LoanProductCommand;
 import org.mifosplatform.portfolio.loanproduct.service.LoanProductWritePlatformService;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/OfficeCommandHandler.java

@@ -8,11 +8,11 @@ import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.office.service.OfficeWritePlatformService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.service.OfficeWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/OfficeTransactionCommandHandler.java

@@ -7,11 +7,11 @@ import org.joda.time.LocalDate;
 import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.office.service.OfficeWritePlatformService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.office.service.OfficeWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/PermissionsCommandHandler.java

@@ -9,10 +9,10 @@ import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.command.PermissionsCommand;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
-import org.mifosplatform.infrastructure.user.service.PermissionWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.command.PermissionsCommand;
+import org.mifosplatform.useradministration.domain.AppUser;
+import org.mifosplatform.useradministration.service.PermissionWritePlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/RoleCommandHandler.java

@@ -9,11 +9,11 @@ import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.command.RoleCommand;
-import org.mifosplatform.infrastructure.user.command.RolePermissionCommand;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
-import org.mifosplatform.infrastructure.user.service.RoleWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.command.RoleCommand;
+import org.mifosplatform.useradministration.command.RolePermissionCommand;
+import org.mifosplatform.useradministration.domain.AppUser;
+import org.mifosplatform.useradministration.service.RoleWritePlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/StaffCommandHandler.java

@@ -9,10 +9,10 @@ import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
-import org.mifosplatform.infrastructure.staff.service.StaffWritePlatformService;
+import org.mifosplatform.organisation.staff.service.StaffWritePlatformService;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/handler/UserCommandHandler.java

@@ -8,10 +8,10 @@ import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.service.ChangeDetectionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandDeserializerService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.command.UserCommand;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
-import org.mifosplatform.infrastructure.user.service.AppUserWritePlatformService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.command.UserCommand;
+import org.mifosplatform.useradministration.domain.AppUser;
+import org.mifosplatform.useradministration.service.AppUserWritePlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java

@@ -6,7 +6,7 @@ import org.mifosplatform.commands.domain.CommandSourceRepository;
 import org.mifosplatform.commands.handler.CommandSourceHandlerDelegator;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformService.java

@@ -2,7 +2,7 @@ package org.mifosplatform.commands.service;
 
 import java.util.Collection;
 
-import org.mifosplatform.commands.api.data.CommandSourceData;
+import org.mifosplatform.commands.data.CommandSourceData;
 
 public interface PortfolioCommandsReadPlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandsReadPlatformServiceImpl.java

@@ -5,7 +5,7 @@ import java.sql.SQLException;
 import java.util.Collection;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.commands.api.data.CommandSourceData;
+import org.mifosplatform.commands.data.CommandSourceData;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java

@@ -5,10 +5,10 @@ import org.mifosplatform.infrastructure.codes.domain.Code;
 import org.mifosplatform.infrastructure.codes.domain.CodeRepository;
 import org.mifosplatform.infrastructure.codes.exception.CodeNotFoundException;
 import org.mifosplatform.infrastructure.codes.exception.SystemDefinedCodeCannotBeChangedException;
-import org.mifosplatform.infrastructure.configuration.service.ConfigurationDomainService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.monetary.service.ConfigurationDomainService;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/configuration/service/CurrencyWritePlatformService.java

@@ -1,9 +0,0 @@
-package org.mifosplatform.infrastructure.configuration.service;
-
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
-
-public interface CurrencyWritePlatformService {
-
-    void updateAllowedCurrencies(CurrencyCommand command);
-
-}

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/configuration/service/OrganisationCurrencyReadPlatformService.java

@@ -1,9 +0,0 @@
-package org.mifosplatform.infrastructure.configuration.service;
-
-import org.mifosplatform.infrastructure.configuration.data.ConfigurationData;
-
-public interface OrganisationCurrencyReadPlatformService {
-
-    ConfigurationData retrieveCurrencyConfiguration();
-
-}

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/GoogleGsonPortfolioApiJsonSerializerService.java

@@ -5,22 +5,17 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.mifosplatform.commands.api.data.CommandSourceData;
+import org.mifosplatform.commands.data.CommandSourceData;
 import org.mifosplatform.infrastructure.codes.data.CodeData;
-import org.mifosplatform.infrastructure.configuration.data.ConfigurationData;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.dataqueries.data.DatatableData;
 import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData;
 import org.mifosplatform.infrastructure.documentmanagement.data.DocumentData;
-import org.mifosplatform.infrastructure.office.data.OfficeData;
+import org.mifosplatform.organisation.monetary.data.ConfigurationData;
-import org.mifosplatform.infrastructure.office.data.OfficeTransactionData;
+import org.mifosplatform.organisation.office.data.OfficeData;
-import org.mifosplatform.infrastructure.staff.data.BulkTransferLoanOfficerData;
+import org.mifosplatform.organisation.office.data.OfficeTransactionData;
-import org.mifosplatform.infrastructure.staff.data.StaffData;
+import org.mifosplatform.organisation.staff.data.BulkTransferLoanOfficerData;
-import org.mifosplatform.infrastructure.user.api.data.AppUserData;
+import org.mifosplatform.organisation.staff.data.StaffData;
-import org.mifosplatform.infrastructure.user.api.data.AuthenticatedUserData;
-import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData;
-import org.mifosplatform.infrastructure.user.api.data.RoleData;
-import org.mifosplatform.infrastructure.user.api.data.RolePermissionsData;
 import org.mifosplatform.portfolio.charge.data.ChargeData;
 import org.mifosplatform.portfolio.client.data.ClientAccountSummaryCollectionData;
 import org.mifosplatform.portfolio.client.data.ClientData;
@@ -39,6 +34,11 @@ import org.mifosplatform.portfolio.savingsaccount.data.SavingAccountData;
 import org.mifosplatform.portfolio.savingsaccountproduct.data.SavingProductData;
 import org.mifosplatform.portfolio.savingsdepositaccount.data.DepositAccountData;
 import org.mifosplatform.portfolio.savingsdepositproduct.data.DepositProductData;
+import org.mifosplatform.useradministration.data.AppUserData;
+import org.mifosplatform.useradministration.data.AuthenticatedUserData;
+import org.mifosplatform.useradministration.data.PermissionUsageData;
+import org.mifosplatform.useradministration.data.RoleData;
+import org.mifosplatform.useradministration.data.RolePermissionsData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiDataConversionService.java

@@ -1,15 +1,11 @@
 package org.mifosplatform.infrastructure.core.api;
 
 import org.mifosplatform.infrastructure.codes.command.CodeCommand;
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.staff.command.BulkTransferLoanOfficerCommand;
+import org.mifosplatform.organisation.staff.command.BulkTransferLoanOfficerCommand;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
-import org.mifosplatform.infrastructure.user.command.PermissionsCommand;
-import org.mifosplatform.infrastructure.user.command.RoleCommand;
-import org.mifosplatform.infrastructure.user.command.RolePermissionCommand;
-import org.mifosplatform.infrastructure.user.command.UserCommand;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
 import org.mifosplatform.portfolio.client.command.ClientCommand;
 import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
@@ -32,6 +28,10 @@ import org.mifosplatform.portfolio.savingsdepositaccount.command.DepositAccountW
 import org.mifosplatform.portfolio.savingsdepositaccount.command.DepositStateTransitionApprovalCommand;
 import org.mifosplatform.portfolio.savingsdepositaccount.command.DepositStateTransitionCommand;
 import org.mifosplatform.portfolio.savingsdepositproduct.command.DepositProductCommand;
+import org.mifosplatform.useradministration.command.PermissionsCommand;
+import org.mifosplatform.useradministration.command.RoleCommand;
+import org.mifosplatform.useradministration.command.RolePermissionCommand;
+import org.mifosplatform.useradministration.command.UserCommand;
 
 public interface PortfolioApiDataConversionService {
 

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiDataConversionServiceImpl.java

@@ -18,19 +18,15 @@ import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.mifosplatform.infrastructure.codes.command.CodeCommand;
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
 import org.mifosplatform.infrastructure.core.data.ApiParameterError;
 import org.mifosplatform.infrastructure.core.exception.InvalidJsonException;
 import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.mifosplatform.infrastructure.core.exception.UnsupportedParameterException;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.staff.command.BulkTransferLoanOfficerCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.command.BulkTransferLoanOfficerCommand;
-import org.mifosplatform.infrastructure.user.command.PermissionsCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
-import org.mifosplatform.infrastructure.user.command.RoleCommand;
-import org.mifosplatform.infrastructure.user.command.RolePermissionCommand;
-import org.mifosplatform.infrastructure.user.command.UserCommand;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
 import org.mifosplatform.portfolio.client.command.ClientCommand;
 import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
@@ -53,6 +49,10 @@ import org.mifosplatform.portfolio.savingsdepositaccount.command.DepositAccountW
 import org.mifosplatform.portfolio.savingsdepositaccount.command.DepositStateTransitionApprovalCommand;
 import org.mifosplatform.portfolio.savingsdepositaccount.command.DepositStateTransitionCommand;
 import org.mifosplatform.portfolio.savingsdepositproduct.command.DepositProductCommand;
+import org.mifosplatform.useradministration.command.PermissionsCommand;
+import org.mifosplatform.useradministration.command.RoleCommand;
+import org.mifosplatform.useradministration.command.RolePermissionCommand;
+import org.mifosplatform.useradministration.command.UserCommand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.number.NumberFormatter;
 import org.springframework.stereotype.Service;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiJsonSerializerService.java

@@ -3,22 +3,17 @@ package org.mifosplatform.infrastructure.core.api;
 import java.util.Collection;
 import java.util.Set;
 
-import org.mifosplatform.commands.api.data.CommandSourceData;
+import org.mifosplatform.commands.data.CommandSourceData;
 import org.mifosplatform.infrastructure.codes.data.CodeData;
-import org.mifosplatform.infrastructure.configuration.data.ConfigurationData;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.dataqueries.data.DatatableData;
 import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData;
 import org.mifosplatform.infrastructure.documentmanagement.data.DocumentData;
-import org.mifosplatform.infrastructure.office.data.OfficeData;
+import org.mifosplatform.organisation.monetary.data.ConfigurationData;
-import org.mifosplatform.infrastructure.office.data.OfficeTransactionData;
+import org.mifosplatform.organisation.office.data.OfficeData;
-import org.mifosplatform.infrastructure.staff.data.BulkTransferLoanOfficerData;
+import org.mifosplatform.organisation.office.data.OfficeTransactionData;
-import org.mifosplatform.infrastructure.staff.data.StaffData;
+import org.mifosplatform.organisation.staff.data.BulkTransferLoanOfficerData;
-import org.mifosplatform.infrastructure.user.api.data.AppUserData;
+import org.mifosplatform.organisation.staff.data.StaffData;
-import org.mifosplatform.infrastructure.user.api.data.AuthenticatedUserData;
-import org.mifosplatform.infrastructure.user.api.data.PermissionUsageData;
-import org.mifosplatform.infrastructure.user.api.data.RoleData;
-import org.mifosplatform.infrastructure.user.api.data.RolePermissionsData;
 import org.mifosplatform.portfolio.charge.data.ChargeData;
 import org.mifosplatform.portfolio.client.data.ClientAccountSummaryCollectionData;
 import org.mifosplatform.portfolio.client.data.ClientData;
@@ -37,6 +32,11 @@ import org.mifosplatform.portfolio.savingsaccount.data.SavingAccountData;
 import org.mifosplatform.portfolio.savingsaccountproduct.data.SavingProductData;
 import org.mifosplatform.portfolio.savingsdepositaccount.data.DepositAccountData;
 import org.mifosplatform.portfolio.savingsdepositproduct.data.DepositProductData;
+import org.mifosplatform.useradministration.data.AppUserData;
+import org.mifosplatform.useradministration.data.AuthenticatedUserData;
+import org.mifosplatform.useradministration.data.PermissionUsageData;
+import org.mifosplatform.useradministration.data.RoleData;
+import org.mifosplatform.useradministration.data.RolePermissionsData;
 
 public interface PortfolioApiJsonSerializerService {
 

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioCommandDeerializerServiceGoogleGson.java

@@ -8,20 +8,20 @@ import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
 import org.mifosplatform.infrastructure.codes.command.CodeCommand;
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
 import org.mifosplatform.infrastructure.core.exception.InvalidJsonException;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.user.command.PermissionsCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
-import org.mifosplatform.infrastructure.user.command.RoleCommand;
-import org.mifosplatform.infrastructure.user.command.RolePermissionCommand;
-import org.mifosplatform.infrastructure.user.command.UserCommand;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
 import org.mifosplatform.portfolio.client.command.ClientCommand;
 import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
 import org.mifosplatform.portfolio.fund.command.FundCommand;
 import org.mifosplatform.portfolio.loanproduct.command.LoanProductCommand;
+import org.mifosplatform.useradministration.command.PermissionsCommand;
+import org.mifosplatform.useradministration.command.RoleCommand;
+import org.mifosplatform.useradministration.command.RolePermissionCommand;
+import org.mifosplatform.useradministration.command.UserCommand;
 import org.springframework.stereotype.Service;
 
 import com.google.gson.Gson;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioCommandDeserializerService.java

@@ -1,19 +1,19 @@
 package org.mifosplatform.infrastructure.core.api;
 
 import org.mifosplatform.infrastructure.codes.command.CodeCommand;
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
-import org.mifosplatform.infrastructure.user.command.PermissionsCommand;
-import org.mifosplatform.infrastructure.user.command.RoleCommand;
-import org.mifosplatform.infrastructure.user.command.RolePermissionCommand;
-import org.mifosplatform.infrastructure.user.command.UserCommand;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
 import org.mifosplatform.portfolio.client.command.ClientCommand;
 import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
 import org.mifosplatform.portfolio.fund.command.FundCommand;
 import org.mifosplatform.portfolio.loanproduct.command.LoanProductCommand;
+import org.mifosplatform.useradministration.command.PermissionsCommand;
+import org.mifosplatform.useradministration.command.RoleCommand;
+import org.mifosplatform.useradministration.command.RolePermissionCommand;
+import org.mifosplatform.useradministration.command.UserCommand;
 
 /**
  * Service for de-serializing JSON for a command into the platforms internal

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/domain/AuditorAwareImpl.java

@@ -1,7 +1,7 @@
 package org.mifosplatform.infrastructure.core.domain;
 
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
-import org.mifosplatform.infrastructure.user.domain.AppUserRepository;
+import org.mifosplatform.useradministration.domain.AppUserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.core.Authentication;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/exceptionmapper/UnAuthenticatedUserExceptionMapper.java

@@ -7,7 +7,7 @@ import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 import org.mifosplatform.infrastructure.core.data.ApiGlobalErrorResponse;
-import org.mifosplatform.infrastructure.user.exception.UnAuthenticatedUserException;
+import org.mifosplatform.useradministration.exception.UnAuthenticatedUserException;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/DataTableApiResource.java

@@ -32,7 +32,7 @@ import org.mifosplatform.infrastructure.dataqueries.service.GenericDataService;
 import org.mifosplatform.infrastructure.dataqueries.service.ReadWriteNonCoreDataService;
 import org.mifosplatform.infrastructure.security.exception.NoAuthorizationException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/ReportsApiResource.java

@@ -24,7 +24,7 @@ import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData;
 import org.mifosplatform.infrastructure.dataqueries.service.ReadReportingService;
 import org.mifosplatform.infrastructure.security.exception.NoAuthorizationException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java

@@ -25,7 +25,7 @@ import org.mifosplatform.infrastructure.dataqueries.data.ResultsetColumnHeader;
 import org.mifosplatform.infrastructure.dataqueries.data.ResultsetDataRow;
 import org.mifosplatform.infrastructure.dataqueries.exception.ReportNotFoundException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.pentaho.reporting.engine.classic.core.ClassicEngineBoot;
 import org.pentaho.reporting.engine.classic.core.MasterReport;
 import org.pentaho.reporting.engine.classic.core.ReportProcessingException;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java

@@ -23,7 +23,7 @@ import org.mifosplatform.infrastructure.dataqueries.data.ResultsetColumnValue;
 import org.mifosplatform.infrastructure.dataqueries.data.ResultsetDataRow;
 import org.mifosplatform.infrastructure.dataqueries.exception.DataTableNotFoundException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/domain/Document.java

@@ -7,7 +7,7 @@ import javax.persistence.Table;
 import org.apache.commons.lang.StringUtils;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
 import org.mifosplatform.infrastructure.documentmanagement.command.DocumentCommand;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "m_document")

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformPasswordEncoder.java

@@ -2,9 +2,7 @@ package org.mifosplatform.infrastructure.security.service;
 
 import org.mifosplatform.infrastructure.security.domain.PlatformUser;
 
-
 public interface PlatformPasswordEncoder {
 
     String encode(PlatformUser appUser);
-
 }

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/PlatformSecurityContext.java

@@ -1,6 +1,6 @@
 package org.mifosplatform.infrastructure.security.service;
 
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 public interface PlatformSecurityContext {
 

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java

@@ -1,7 +1,7 @@
 package org.mifosplatform.infrastructure.security.service;
 
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
-import org.mifosplatform.infrastructure.user.exception.UnAuthenticatedUserException;
+import org.mifosplatform.useradministration.exception.UnAuthenticatedUserException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/user/service/PermissionWritePlatformService.java

@@ -1,8 +0,0 @@
-package org.mifosplatform.infrastructure.user.service;
-
-import org.mifosplatform.infrastructure.user.command.PermissionsCommand;
-
-public interface PermissionWritePlatformService {
-
-    void updateMakerCheckerPermissions(PermissionsCommand command);
-}

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/api/CurrenciesApiResource.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.api;
+package org.mifosplatform.organisation.monetary.api;
 
 import java.util.Arrays;
 import java.util.List;
@@ -14,15 +14,15 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
 
 import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService;
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.configuration.data.ConfigurationData;
-import org.mifosplatform.infrastructure.configuration.service.OrganisationCurrencyReadPlatformService;
 import org.mifosplatform.infrastructure.core.api.ApiParameterHelper;
 import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioApiJsonSerializerService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandSerializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
+import org.mifosplatform.organisation.monetary.data.ConfigurationData;
+import org.mifosplatform.organisation.monetary.service.OrganisationCurrencyReadPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/command/CurrencyCommand.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.command;
+package org.mifosplatform.organisation.monetary.command;
 
 import java.util.ArrayList;
 import java.util.Arrays;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/data/ConfigurationData.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.data;
+package org.mifosplatform.organisation.monetary.data;
 
 import java.util.Collection;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/data/CurrencyData.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.data;
+package org.mifosplatform.organisation.monetary.data;
 
 /**
  * Immutable data object representing currency.

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/domain/ApplicationCurrency.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.domain;
+package org.mifosplatform.organisation.monetary.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/domain/ApplicationCurrencyRepository.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.domain;
+package org.mifosplatform.organisation.monetary.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/domain/MonetaryCurrency.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.domain;
+package org.mifosplatform.organisation.monetary.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/domain/Money.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.domain;
+package org.mifosplatform.organisation.monetary.domain;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/exception/CurrencyNotFoundException.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.exception;
+package org.mifosplatform.organisation.monetary.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/ConfigurationDomainService.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.configuration.service;
+package org.mifosplatform.organisation.monetary.service;
 
 public interface ConfigurationDomainService {
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/ConfigurationDomainServiceJpa.java

@@ -1,8 +1,8 @@
-package org.mifosplatform.infrastructure.configuration.service;
+package org.mifosplatform.organisation.monetary.service;
 
-import org.mifosplatform.infrastructure.user.domain.Permission;
+import org.mifosplatform.useradministration.domain.Permission;
-import org.mifosplatform.infrastructure.user.domain.PermissionRepository;
+import org.mifosplatform.useradministration.domain.PermissionRepository;
-import org.mifosplatform.infrastructure.user.exception.PermissionNotFoundException;
+import org.mifosplatform.useradministration.exception.PermissionNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/CurrencyReadPlatformService.java

@@ -1,8 +1,8 @@
-package org.mifosplatform.infrastructure.configuration.service;
+package org.mifosplatform.organisation.monetary.service;
 
 import java.util.List;
 
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
 
 public interface CurrencyReadPlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java

@@ -1,13 +1,13 @@
-package org.mifosplatform.infrastructure.configuration.service;
+package org.mifosplatform.organisation.monetary.service;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/CurrencyWritePlatformService.java

@@ -0,0 +1,9 @@
+package org.mifosplatform.organisation.monetary.service;
+
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
+
+public interface CurrencyWritePlatformService {
+
+    void updateAllowedCurrencies(CurrencyCommand command);
+
+}

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/CurrencyWritePlatformServiceJpaRepositoryImpl.java

@@ -1,19 +1,19 @@
-package org.mifosplatform.infrastructure.configuration.service;
+package org.mifosplatform.organisation.monetary.service;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.mifosplatform.infrastructure.configuration.command.CurrencyCommand;
-import org.mifosplatform.infrastructure.configuration.domain.ApplicationCurrency;
-import org.mifosplatform.infrastructure.configuration.domain.ApplicationCurrencyRepository;
 import org.mifosplatform.infrastructure.core.data.ApiParameterError;
 import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;
 import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;
-import org.mifosplatform.infrastructure.office.domain.OrganisationCurrency;
-import org.mifosplatform.infrastructure.office.domain.OrganisationCurrencyRepository;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.monetary.command.CurrencyCommand;
+import org.mifosplatform.organisation.monetary.domain.ApplicationCurrency;
+import org.mifosplatform.organisation.monetary.domain.ApplicationCurrencyRepository;
+import org.mifosplatform.organisation.office.domain.OrganisationCurrency;
+import org.mifosplatform.organisation.office.domain.OrganisationCurrencyRepository;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/OrganisationCurrencyReadPlatformService.java

@@ -0,0 +1,9 @@
+package org.mifosplatform.organisation.monetary.service;
+
+import org.mifosplatform.organisation.monetary.data.ConfigurationData;
+
+public interface OrganisationCurrencyReadPlatformService {
+
+    ConfigurationData retrieveCurrencyConfiguration();
+
+}

mifosng-provider/src/main/java/org/mifosplatform/organisation/monetary/service/OrganisationCurrencyReadPlatformServiceImpl.java

@@ -1,9 +1,9 @@
-package org.mifosplatform.infrastructure.configuration.service;
+package org.mifosplatform.organisation.monetary.service;
 
 import java.util.List;
 
-import org.mifosplatform.infrastructure.configuration.data.ConfigurationData;
+import org.mifosplatform.organisation.monetary.data.ConfigurationData;
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/api/OfficeTransactionsApiResource.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.api;
+package org.mifosplatform.organisation.office.api;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -20,10 +20,10 @@ import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionServi
 import org.mifosplatform.infrastructure.core.api.PortfolioApiJsonSerializerService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandSerializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.office.data.OfficeTransactionData;
-import org.mifosplatform.infrastructure.office.service.OfficeReadPlatformService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.office.data.OfficeTransactionData;
+import org.mifosplatform.organisation.office.service.OfficeReadPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/api/OfficesApiResource.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.api;
+package org.mifosplatform.organisation.office.api;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,11 +23,11 @@ import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionServi
 import org.mifosplatform.infrastructure.core.api.PortfolioApiJsonSerializerService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandSerializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.office.data.OfficeData;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
-import org.mifosplatform.infrastructure.office.service.OfficeReadPlatformService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.data.OfficeData;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.service.OfficeReadPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/command/BranchMoneyTransferCommand.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.command;
+package org.mifosplatform.organisation.office.command;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/command/OfficeCommand.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.command;
+package org.mifosplatform.organisation.office.command;
 
 import java.util.ArrayList;
 import java.util.List;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/data/OfficeData.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.data;
+package org.mifosplatform.organisation.office.data;
 
 import java.util.List;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/data/OfficeLookup.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.data;
+package org.mifosplatform.organisation.office.data;
 
 /**
  * Immutable data object used for office lookups (will remove eventually and just use {@link OfficeData}.

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/data/OfficeTransactionData.java

@@ -1,10 +1,10 @@
-package org.mifosplatform.infrastructure.office.data;
+package org.mifosplatform.organisation.office.data;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
 
 /**
  * Immutable data object for office transactions.

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/Office.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.domain;
+package org.mifosplatform.organisation.office.domain;
 
 import java.util.Date;
 import java.util.LinkedList;
@@ -18,10 +18,10 @@ import javax.persistence.UniqueConstraint;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.office.exception.CannotUpdateOfficeWithParentOfficeSameAsSelf;
+import org.mifosplatform.organisation.office.exception.CannotUpdateOfficeWithParentOfficeSameAsSelf;
-import org.mifosplatform.infrastructure.office.exception.RootOfficeParentCannotBeUpdated;
+import org.mifosplatform.organisation.office.exception.RootOfficeParentCannotBeUpdated;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "m_office", uniqueConstraints={

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/OfficeRepository.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.domain;
+package org.mifosplatform.organisation.office.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/OfficeTransaction.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.domain;
+package org.mifosplatform.organisation.office.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -14,10 +14,10 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.configuration.domain.MonetaryCurrency;
-import org.mifosplatform.infrastructure.configuration.domain.Money;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.organisation.monetary.domain.MonetaryCurrency;
+import org.mifosplatform.organisation.monetary.domain.Money;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "m_office_transaction")

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/OfficeTransactionRepository.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.domain;
+package org.mifosplatform.organisation.office.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/OrganisationCurrency.java

@@ -1,11 +1,11 @@
-package org.mifosplatform.infrastructure.office.domain;
+package org.mifosplatform.organisation.office.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "m_organisation_currency")

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/OrganisationCurrencyRepository.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.domain;
+package org.mifosplatform.organisation.office.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/exception/CannotUpdateOfficeWithParentOfficeSameAsSelf.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.exception;
+package org.mifosplatform.organisation.office.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/exception/InvalidOfficeException.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.exception;
+package org.mifosplatform.organisation.office.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/exception/OfficeNotFoundException.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.exception;
+package org.mifosplatform.organisation.office.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/exception/RootOfficeParentCannotBeUpdated.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.exception;
+package org.mifosplatform.organisation.office.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformService.java

@@ -1,11 +1,11 @@
-package org.mifosplatform.infrastructure.office.service;
+package org.mifosplatform.organisation.office.service;
 
 import java.util.Collection;
 import java.util.List;
 
-import org.mifosplatform.infrastructure.office.data.OfficeData;
+import org.mifosplatform.organisation.office.data.OfficeData;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
-import org.mifosplatform.infrastructure.office.data.OfficeTransactionData;
+import org.mifosplatform.organisation.office.data.OfficeTransactionData;
 
 public interface OfficeReadPlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.office.service;
+package org.mifosplatform.organisation.office.service;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -8,16 +8,16 @@ import java.util.Collection;
 import java.util.List;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
-import org.mifosplatform.infrastructure.configuration.service.CurrencyReadPlatformService;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
-import org.mifosplatform.infrastructure.office.data.OfficeData;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
-import org.mifosplatform.infrastructure.office.data.OfficeTransactionData;
-import org.mifosplatform.infrastructure.office.exception.OfficeNotFoundException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
+import org.mifosplatform.organisation.monetary.service.CurrencyReadPlatformService;
+import org.mifosplatform.organisation.office.data.OfficeData;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.data.OfficeTransactionData;
+import org.mifosplatform.organisation.office.exception.OfficeNotFoundException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeWritePlatformService.java

@@ -1,7 +1,7 @@
-package org.mifosplatform.infrastructure.office.service;
+package org.mifosplatform.organisation.office.service;
 
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
 
 public interface OfficeWritePlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java

@@ -1,23 +1,23 @@
-package org.mifosplatform.infrastructure.office.service;
+package org.mifosplatform.organisation.office.service;
 
-import org.mifosplatform.infrastructure.configuration.domain.ApplicationCurrency;
-import org.mifosplatform.infrastructure.configuration.domain.ApplicationCurrencyRepository;
-import org.mifosplatform.infrastructure.configuration.domain.MonetaryCurrency;
-import org.mifosplatform.infrastructure.configuration.domain.Money;
-import org.mifosplatform.infrastructure.configuration.exception.CurrencyNotFoundException;
-import org.mifosplatform.infrastructure.configuration.service.ConfigurationDomainService;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
-import org.mifosplatform.infrastructure.office.command.BranchMoneyTransferCommand;
-import org.mifosplatform.infrastructure.office.command.OfficeCommand;
-import org.mifosplatform.infrastructure.office.domain.Office;
-import org.mifosplatform.infrastructure.office.domain.OfficeRepository;
-import org.mifosplatform.infrastructure.office.domain.OfficeTransaction;
-import org.mifosplatform.infrastructure.office.domain.OfficeTransactionRepository;
-import org.mifosplatform.infrastructure.office.exception.OfficeNotFoundException;
 import org.mifosplatform.infrastructure.security.exception.NoAuthorizationException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.organisation.monetary.domain.ApplicationCurrency;
+import org.mifosplatform.organisation.monetary.domain.ApplicationCurrencyRepository;
+import org.mifosplatform.organisation.monetary.domain.MonetaryCurrency;
+import org.mifosplatform.organisation.monetary.domain.Money;
+import org.mifosplatform.organisation.monetary.exception.CurrencyNotFoundException;
+import org.mifosplatform.organisation.monetary.service.ConfigurationDomainService;
+import org.mifosplatform.organisation.office.command.BranchMoneyTransferCommand;
+import org.mifosplatform.organisation.office.command.OfficeCommand;
+import org.mifosplatform.organisation.office.domain.Office;
+import org.mifosplatform.organisation.office.domain.OfficeRepository;
+import org.mifosplatform.organisation.office.domain.OfficeTransaction;
+import org.mifosplatform.organisation.office.domain.OfficeTransactionRepository;
+import org.mifosplatform.organisation.office.exception.OfficeNotFoundException;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
+import org.mifosplatform.useradministration.domain.AppUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/api/StaffApiResource.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.api;
+package org.mifosplatform.organisation.staff.api;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -24,12 +24,12 @@ import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionServi
 import org.mifosplatform.infrastructure.core.api.PortfolioApiJsonSerializerService;
 import org.mifosplatform.infrastructure.core.api.PortfolioCommandSerializerService;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
-import org.mifosplatform.infrastructure.office.service.OfficeReadPlatformService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
-import org.mifosplatform.infrastructure.staff.data.StaffData;
+import org.mifosplatform.organisation.office.service.OfficeReadPlatformService;
-import org.mifosplatform.infrastructure.staff.service.StaffReadPlatformService;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.data.StaffData;
+import org.mifosplatform.organisation.staff.service.StaffReadPlatformService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/command/BulkTransferLoanOfficerCommand.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.command;
+package org.mifosplatform.organisation.staff.command;
 
 import org.joda.time.LocalDate;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/command/BulkTransferLoanOfficerCommandValidator.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.command;
+package org.mifosplatform.organisation.staff.command;
 
 import org.mifosplatform.infrastructure.core.data.ApiParameterError;
 import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/command/StaffCommand.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.command;
+package org.mifosplatform.organisation.staff.command;
 
 import java.util.ArrayList;
 import java.util.List;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/data/BulkTransferLoanOfficerData.java

@@ -1,7 +1,7 @@
-package org.mifosplatform.infrastructure.staff.data;
+package org.mifosplatform.organisation.staff.data;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
 
 import java.util.Collection;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/data/StaffAccountSummaryCollectionData.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.data;
+package org.mifosplatform.organisation.staff.data;
 
 import java.util.Collection;
 import java.util.List;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/data/StaffData.java

@@ -1,8 +1,8 @@
-package org.mifosplatform.infrastructure.staff.data;
+package org.mifosplatform.organisation.staff.data;
 
 import java.util.Collection;
 
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
 
 /**
  * Immutable data object representing staff data.

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/Staff.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.domain;
+package org.mifosplatform.organisation.staff.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -9,9 +9,9 @@ import javax.persistence.UniqueConstraint;
 
 import org.apache.commons.lang.StringUtils;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
-import org.mifosplatform.infrastructure.office.domain.Office;
+import org.mifosplatform.organisation.office.domain.Office;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "m_staff", uniqueConstraints = { @UniqueConstraint(columnNames = { "display_name" }, name = "display_name") })

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/domain/StaffRepository.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.domain;
+package org.mifosplatform.organisation.staff.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/exception/StaffNotFoundException.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.exception;
+package org.mifosplatform.organisation.staff.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/exception/StaffRoleException.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.exception;
+package org.mifosplatform.organisation.staff.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/service/StaffReadPlatformService.java

@@ -1,9 +1,9 @@
-package org.mifosplatform.infrastructure.staff.service;
+package org.mifosplatform.organisation.staff.service;
 
 import java.util.Collection;
 
-import org.mifosplatform.infrastructure.staff.data.StaffAccountSummaryCollectionData;
+import org.mifosplatform.organisation.staff.data.StaffAccountSummaryCollectionData;
-import org.mifosplatform.infrastructure.staff.data.StaffData;
+import org.mifosplatform.organisation.staff.data.StaffData;
 
 public interface StaffReadPlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/service/StaffReadPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.infrastructure.staff.service;
+package org.mifosplatform.organisation.staff.service;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -9,9 +9,9 @@ import org.apache.commons.lang.StringUtils;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.staff.data.StaffAccountSummaryCollectionData;
+import org.mifosplatform.organisation.staff.data.StaffAccountSummaryCollectionData;
-import org.mifosplatform.infrastructure.staff.data.StaffData;
+import org.mifosplatform.organisation.staff.data.StaffData;
-import org.mifosplatform.infrastructure.staff.exception.StaffNotFoundException;
+import org.mifosplatform.organisation.staff.exception.StaffNotFoundException;
 import org.mifosplatform.portfolio.client.data.ClientAccountSummaryData;
 import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
 import org.mifosplatform.portfolio.group.data.GroupAccountSummaryData;

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/service/StaffWritePlatformService.java

@@ -1,6 +1,6 @@
-package org.mifosplatform.infrastructure.staff.service;
+package org.mifosplatform.organisation.staff.service;
 
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
 
 public interface StaffWritePlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java

@@ -1,16 +1,16 @@
-package org.mifosplatform.infrastructure.staff.service;
+package org.mifosplatform.organisation.staff.service;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosplatform.infrastructure.configuration.service.ConfigurationDomainService;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
-import org.mifosplatform.infrastructure.office.domain.Office;
-import org.mifosplatform.infrastructure.office.domain.OfficeRepository;
-import org.mifosplatform.infrastructure.office.exception.OfficeNotFoundException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.infrastructure.staff.command.StaffCommand;
+import org.mifosplatform.organisation.monetary.service.ConfigurationDomainService;
-import org.mifosplatform.infrastructure.staff.domain.Staff;
+import org.mifosplatform.organisation.office.domain.Office;
-import org.mifosplatform.infrastructure.staff.domain.StaffRepository;
+import org.mifosplatform.organisation.office.domain.OfficeRepository;
-import org.mifosplatform.infrastructure.staff.exception.StaffNotFoundException;
+import org.mifosplatform.organisation.office.exception.OfficeNotFoundException;
+import org.mifosplatform.organisation.staff.command.StaffCommand;
+import org.mifosplatform.organisation.staff.domain.Staff;
+import org.mifosplatform.organisation.staff.domain.StaffRepository;
+import org.mifosplatform.organisation.staff.exception.StaffNotFoundException;
 import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/data/ChargeData.java

@@ -3,8 +3,8 @@ package org.mifosplatform.portfolio.charge.data;
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
 import org.mifosplatform.infrastructure.core.data.EnumOptionData;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
 
 /**
  * Immutable data object for charge data.

mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/domain/Charge.java

@@ -1,8 +1,8 @@
 package org.mifosplatform.portfolio.charge.domain;
 
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
-import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
+import org.mifosplatform.useradministration.domain.AppUser;
 
 import javax.persistence.*;
 import java.math.BigDecimal;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeReadPlatformServiceImpl.java

@@ -7,12 +7,12 @@ import java.util.Collection;
 import java.util.List;
 
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
-import org.mifosplatform.infrastructure.configuration.service.CurrencyReadPlatformService;
 import org.mifosplatform.infrastructure.core.data.EnumOptionData;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.monetary.data.CurrencyData;
+import org.mifosplatform.organisation.monetary.service.CurrencyReadPlatformService;
 import org.mifosplatform.portfolio.charge.data.ChargeData;
 import org.mifosplatform.portfolio.charge.domain.ChargeAppliesTo;
 import org.mifosplatform.portfolio.charge.exception.ChargeNotFoundException;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java

@@ -1,8 +1,8 @@
 package org.mifosplatform.portfolio.charge.service;
 
-import org.mifosplatform.infrastructure.configuration.service.ConfigurationDomainService;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.monetary.service.ConfigurationDomainService;
 import org.mifosplatform.portfolio.charge.command.ChargeDefinitionCommand;
 import org.mifosplatform.portfolio.charge.domain.Charge;
 import org.mifosplatform.portfolio.charge.domain.ChargeAppliesTo;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientsApiResource.java

@@ -23,7 +23,7 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosplatform.commands.api.data.CommandSourceData;
+import org.mifosplatform.commands.data.CommandSourceData;
 import org.mifosplatform.commands.service.PortfolioCommandSourceWritePlatformService;
 import org.mifosplatform.commands.service.PortfolioCommandsReadPlatformService;
 import org.mifosplatform.infrastructure.core.api.ApiConstants;
@@ -34,9 +34,9 @@ import org.mifosplatform.infrastructure.core.api.PortfolioCommandSerializerServi
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.core.domain.Base64EncodedImage;
 import org.mifosplatform.infrastructure.core.service.FileUtils;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
-import org.mifosplatform.infrastructure.office.service.OfficeReadPlatformService;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.service.OfficeReadPlatformService;
 import org.mifosplatform.portfolio.client.command.ClientCommand;
 import org.mifosplatform.portfolio.client.command.NoteCommand;
 import org.mifosplatform.portfolio.client.data.ClientAccountSummaryCollectionData;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientData.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.office.data.OfficeLookup;
+import org.mifosplatform.organisation.office.data.OfficeLookup;
 
 /**
  * Immutable data object representing client data.