Change the way we use modules