Getting rid of the bundled modules
2.0.0-pre6