Replace NDDDSample with AccountPresentationSystem in the Shared folder items and refactored the code