Refactor structure and finish cluster module