Code reorganization. Following better packaging guidelines.