3rd commit.
refine Dao component, Module component.