Switch back from modules to make it more accessible to people not running 7