Elvis-hosted modules to be moved on 18/2