Updated for 3.0.1-RC2

Reorganized things to allo easier reuse