Move some modules around