Refactor azure module structure