chore (modules) : refine modules and packages (refs #5)