Changing all to a single module