Change modules for components and simplify the commands