Restructuring all project and adding some new analysis.