Refactor ACP Module