Factor out to modules after Procfile bug fix.