Alpha 0.3.01

Reorganization