Project and Code reorganization