v.01c

Reorganized code structure.