Working on components modularity ...