Refactor acp module