Also added partials to the modularization & renamed modules to devices
Also added partials to the modularization & renamed modules to devices