Combined module management actions into a single file, so it should be easier to add new optional modules.