Somewhat better modularization - keeps the inits in the module classes