reorganized directory structure
Merge remote branch 'origin/0.1' into 0.1