Components -> Modules, and some style updates