Add some sample bundles.
Finish refactoring the existing spider.