Move some modules from the main distribution to here