Slight refactor of file structure for multi-mods