Reorganize to make it more extendable.