Starting a better structure for modules