Introduce cb-paper packages
Cleanup
Final cleanup
Add web2