Going for a good structure, started the conversion to a module.