Code reorganization
1.0.2