Alpha 0.3.02

More file reorganization...